Pull updates from Andrew Morton: "Most of -mm and quite a number of other subsystems: hotfixes, scripts, ocfs2, misc, lib, binfmt, init, reiserfs, exec, dma-mapping, kcov. MM is fairly quiet this time. Holidays, I assume" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits) kcov: ignore fault-inject and stacktrace include/linux/io-mapping.h-mapping: use PHYS_PFN() macro in io_mapping_map_atomic_wc() execve: warn if process starts with executable stack reiserfs: prevent NULL pointer dereference in reiserfs_insert_item() init/main.c: fix misleading "This architecture does not have kernel memory protection" message init/main.c: fix quoted value handling in unknown_bootoption init/main.c: remove unnecessary repair_env_string in do_initcall_level init/main.c: log arguments and environment passed to init fs/binfmt_elf.c: coredump: allow process with empty address space to coredump fs/binfmt_elf.c: coredump: delete duplicated overflow check fs/binfmt_elf.c: coredump: allocate core ELF header on stack fs/binfmt_elf.c: make BAD_ADDR() unlikely fs/binfmt_elf.c: better codegen around current->mm fs/binfmt_elf.c: don't copy ELF header around fs/binfmt_elf.c: fix ->start_code calculation fs/binfmt_elf.c: smaller code generation around auxv vector fill lib/find_bit.c: uninline helper _find_next_bit() lib/find_bit.c: join _find_next_bit{_le} uapi: rename ext2_swab() to swab() and share globally in swab.h lib/scatterlist.c: adjust indentation in __sg_alloc_table ...
Showing the changes to include/uapi (2 of 136 files). Show all
Unified · Split
| @@ -4,6 +4,7 @@ · 3 unmodified lines | ||
| 4 | 4 | |
| 5 | 5 | #include <linux/types.h> |
| 6 | 6 | #include <linux/compiler.h> |
| 7 | +#include <asm/bitsperlong.h> | |
| 7 | 8 | #include <asm/swab.h> |
| 8 | 9 | |
| 9 | 10 | /* |
| @@ -132,6 +133,15 @@ static inline __attribute_const__ __u32 __fswahb32(__u32 val) · 122 unmodified lines | ||
| 132 | 133 | __fswab64(x)) |
| 133 | 134 | #endif |
| 134 | 135 | |
| 136 | +static __always_inline unsigned long __swab(const unsigned long y) | |
| 137 | +{ | |
| 138 | +#if BITS_PER_LONG == 64 | |
| 139 | + return __swab64(y); | |
| 140 | +#else /* BITS_PER_LONG == 32 */ | |
| 141 | + return __swab32(y); | |
| 142 | +#endif | |
| 143 | +} | |
| 144 | + | |
| 135 | 145 | /** |
| 136 | 146 | * __swahw32 - return a word-swapped 32-bit value |
| 137 | 147 | * @x: value to wordswap |
| @@ -195,7 +195,7 @@ enum · 194 unmodified lines | ||
| 195 | 195 | VM_MIN_UNMAPPED=32, /* Set min percent of unmapped pages */ |
| 196 | 196 | VM_PANIC_ON_OOM=33, /* panic at out-of-memory */ |
| 197 | 197 | VM_VDSO_ENABLED=34, /* map VDSO into new processes? */ |
| 198 | − VM_MIN_SLAB=35, /* Percent pages ignored by zone reclaim */ | |
| 198 | + VM_MIN_SLAB=35, /* Percent pages ignored by node reclaim */ | |
| 199 | 199 | }; |
| 200 | 200 | |
| 201 | 201 | |