diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-01-24 06:47:48 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-01-24 06:47:48 -0500 |
| commit | befddb21c845f8fb49e637997891ef97c6a869dc (patch) | |
| tree | 0e7629123184f2dd50291ad6d477b894175f0f26 /include/linux/cpuset.h | |
| parent | e716efde75267eab919cdb2bef5b2cb77f305326 (diff) | |
| parent | 7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff) | |
Merge tag 'v3.8-rc4' into irq/core
Merge Linux 3.8-rc4 before pulling in new commits - we were on an old v3.7 base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/cpuset.h')
| -rw-r--r-- | include/linux/cpuset.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h index 838320fc3d1d..8c8a60d29407 100644 --- a/include/linux/cpuset.h +++ b/include/linux/cpuset.h | |||
| @@ -144,7 +144,7 @@ static inline nodemask_t cpuset_mems_allowed(struct task_struct *p) | |||
| 144 | return node_possible_map; | 144 | return node_possible_map; |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | #define cpuset_current_mems_allowed (node_states[N_HIGH_MEMORY]) | 147 | #define cpuset_current_mems_allowed (node_states[N_MEMORY]) |
| 148 | static inline void cpuset_init_current_mems_allowed(void) {} | 148 | static inline void cpuset_init_current_mems_allowed(void) {} |
| 149 | 149 | ||
| 150 | static inline int cpuset_nodemask_valid_mems_allowed(nodemask_t *nodemask) | 150 | static inline int cpuset_nodemask_valid_mems_allowed(nodemask_t *nodemask) |