diff options
Diffstat (limited to 'include/linux/cpuset.h')
-rw-r--r-- | include/linux/cpuset.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h index ea44d2e768a0..ecae585ec3da 100644 --- a/include/linux/cpuset.h +++ b/include/linux/cpuset.h | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
12 | #include <linux/cpumask.h> | 12 | #include <linux/cpumask.h> |
13 | #include <linux/nodemask.h> | 13 | #include <linux/nodemask.h> |
14 | #include <linux/cgroup.h> | ||
14 | 15 | ||
15 | #ifdef CONFIG_CPUSETS | 16 | #ifdef CONFIG_CPUSETS |
16 | 17 | ||
@@ -19,9 +20,8 @@ extern int number_of_cpusets; /* How many cpusets are defined in system? */ | |||
19 | extern int cpuset_init_early(void); | 20 | extern int cpuset_init_early(void); |
20 | extern int cpuset_init(void); | 21 | extern int cpuset_init(void); |
21 | extern void cpuset_init_smp(void); | 22 | extern void cpuset_init_smp(void); |
22 | extern void cpuset_fork(struct task_struct *p); | ||
23 | extern void cpuset_exit(struct task_struct *p); | ||
24 | extern cpumask_t cpuset_cpus_allowed(struct task_struct *p); | 23 | extern cpumask_t cpuset_cpus_allowed(struct task_struct *p); |
24 | extern cpumask_t cpuset_cpus_allowed_locked(struct task_struct *p); | ||
25 | extern nodemask_t cpuset_mems_allowed(struct task_struct *p); | 25 | extern nodemask_t cpuset_mems_allowed(struct task_struct *p); |
26 | #define cpuset_current_mems_allowed (current->mems_allowed) | 26 | #define cpuset_current_mems_allowed (current->mems_allowed) |
27 | void cpuset_init_current_mems_allowed(void); | 27 | void cpuset_init_current_mems_allowed(void); |
@@ -76,18 +76,22 @@ static inline int cpuset_do_slab_mem_spread(void) | |||
76 | 76 | ||
77 | extern void cpuset_track_online_nodes(void); | 77 | extern void cpuset_track_online_nodes(void); |
78 | 78 | ||
79 | extern int current_cpuset_is_being_rebound(void); | ||
80 | |||
79 | #else /* !CONFIG_CPUSETS */ | 81 | #else /* !CONFIG_CPUSETS */ |
80 | 82 | ||
81 | static inline int cpuset_init_early(void) { return 0; } | 83 | static inline int cpuset_init_early(void) { return 0; } |
82 | static inline int cpuset_init(void) { return 0; } | 84 | static inline int cpuset_init(void) { return 0; } |
83 | static inline void cpuset_init_smp(void) {} | 85 | static inline void cpuset_init_smp(void) {} |
84 | static inline void cpuset_fork(struct task_struct *p) {} | ||
85 | static inline void cpuset_exit(struct task_struct *p) {} | ||
86 | 86 | ||
87 | static inline cpumask_t cpuset_cpus_allowed(struct task_struct *p) | 87 | static inline cpumask_t cpuset_cpus_allowed(struct task_struct *p) |
88 | { | 88 | { |
89 | return cpu_possible_map; | 89 | return cpu_possible_map; |
90 | } | 90 | } |
91 | static inline cpumask_t cpuset_cpus_allowed_locked(struct task_struct *p) | ||
92 | { | ||
93 | return cpu_possible_map; | ||
94 | } | ||
91 | 95 | ||
92 | static inline nodemask_t cpuset_mems_allowed(struct task_struct *p) | 96 | static inline nodemask_t cpuset_mems_allowed(struct task_struct *p) |
93 | { | 97 | { |
@@ -148,6 +152,11 @@ static inline int cpuset_do_slab_mem_spread(void) | |||
148 | 152 | ||
149 | static inline void cpuset_track_online_nodes(void) {} | 153 | static inline void cpuset_track_online_nodes(void) {} |
150 | 154 | ||
155 | static inline int current_cpuset_is_being_rebound(void) | ||
156 | { | ||
157 | return 0; | ||
158 | } | ||
159 | |||
151 | #endif /* !CONFIG_CPUSETS */ | 160 | #endif /* !CONFIG_CPUSETS */ |
152 | 161 | ||
153 | #endif /* _LINUX_CPUSET_H */ | 162 | #endif /* _LINUX_CPUSET_H */ |