Merge misc updates from Andrew Morton: - a few hotfixes - various misc updates - ocfs2 updates - most of MM * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (108 commits) mm, memory_hotplug: move movable_node to the hotplug proper mm, memory_hotplug: drop CONFIG_MOVABLE_NODE mm, memory_hotplug: drop artificial restriction on online/offline mm: memcontrol: account slab stats per lruvec mm: memcontrol: per-lruvec stats infrastructure mm: memcontrol: use generic mod_memcg_page_state for kmem pages mm: memcontrol: use the node-native slab memory counters mm: vmstat: move slab statistics from zone to node counters mm/zswap.c: delete an error message for a failed memory allocation in zswap_dstmem_prepare() mm/zswap.c: improve a size determination in zswap_frontswap_init() mm/zswap.c: delete an error message for a failed memory allocation in zswap_pool_create() mm/swapfile.c: sort swap entries before free mm/oom_kill: count global and memory cgroup oom kills mm: per-cgroup memory reclaim stats mm: kmemleak: treat vm_struct as alternative reference to vmalloc'ed objects mm: kmemleak: factor object reference updating out of scan_block() mm: kmemleak: slightly reduce the size of some structures on 64-bit architectures mm, mempolicy: don't check cpuset seqlock where it doesn't matter mm, cpuset: always use seqlock when changing task's nodemask mm, mempolicy: simplify rebinding mempolicies when updating cpusets ...
Showing the changes to include/uapi/linux (2 of 131 files). Show all
Unified · Split
| @@ -42,6 +42,7 @@ · 41 unmodified lines | ||
| 42 | 42 | #define MSDOS_SUPER_MAGIC 0x4d44 /* MD */ |
| 43 | 43 | #define NCP_SUPER_MAGIC 0x564c /* Guess, what 0x564c is :-) */ |
| 44 | 44 | #define NFS_SUPER_MAGIC 0x6969 |
| 45 | +#define OCFS2_SUPER_MAGIC 0x7461636f | |
| 45 | 46 | #define OPENPROM_SUPER_MAGIC 0x9fa1 |
| 46 | 47 | #define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */ |
| 47 | 48 | #define QNX6_SUPER_MAGIC 0x68191122 /* qnx6 fs detection */ |
| @@ -24,13 +24,6 @@ enum { · 23 unmodified lines | ||
| 24 | 24 | MPOL_MAX, /* always last member of enum */ |
| 25 | 25 | }; |
| 26 | 26 | |
| 27 | −enum mpol_rebind_step { | |
| 28 | − MPOL_REBIND_ONCE, /* do rebind work at once(not by two step) */ | |
| 29 | − MPOL_REBIND_STEP1, /* first step(set all the newly nodes) */ | |
| 30 | − MPOL_REBIND_STEP2, /* second step(clean all the disallowed nodes)*/ | |
| 31 | − MPOL_REBIND_NSTEP, | |
| 32 | −}; | |
| 33 | − | |
| 34 | 27 | /* Flags for set_mempolicy */ |
| 35 | 28 | #define MPOL_F_STATIC_NODES (1 << 15) |
| 36 | 29 | #define MPOL_F_RELATIVE_NODES (1 << 14) |
| @@ -65,7 +58,6 @@ enum mpol_rebind_step { · 28 unmodified lines | ||
| 65 | 58 | */ |
| 66 | 59 | #define MPOL_F_SHARED (1 << 0) /* identify shared policies */ |
| 67 | 60 | #define MPOL_F_LOCAL (1 << 1) /* preferred local allocation */ |
| 68 | −#define MPOL_F_REBINDING (1 << 2) /* identify policies in rebinding */ | |
| 69 | 61 | #define MPOL_F_MOF (1 << 3) /* this policy wants migrate on fault */ |
| 70 | 62 | #define MPOL_F_MORON (1 << 4) /* Migrate On protnone Reference On Node */ |
| 71 | 63 | |