aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cpuset.c8
-rw-r--r--kernel/sched.c4
2 files changed, 1 insertions, 11 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index b5cb469d2545..d247381e7371 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -2537,15 +2537,9 @@ const struct file_operations proc_cpuset_operations = {
2537}; 2537};
2538#endif /* CONFIG_PROC_PID_CPUSET */ 2538#endif /* CONFIG_PROC_PID_CPUSET */
2539 2539
2540/* Display task cpus_allowed, mems_allowed in /proc/<pid>/status file. */ 2540/* Display task mems_allowed in /proc/<pid>/status file. */
2541void cpuset_task_status_allowed(struct seq_file *m, struct task_struct *task) 2541void cpuset_task_status_allowed(struct seq_file *m, struct task_struct *task)
2542{ 2542{
2543 seq_printf(m, "Cpus_allowed:\t");
2544 seq_cpumask(m, &task->cpus_allowed);
2545 seq_printf(m, "\n");
2546 seq_printf(m, "Cpus_allowed_list:\t");
2547 seq_cpumask_list(m, &task->cpus_allowed);
2548 seq_printf(m, "\n");
2549 seq_printf(m, "Mems_allowed:\t"); 2543 seq_printf(m, "Mems_allowed:\t");
2550 seq_nodemask(m, &task->mems_allowed); 2544 seq_nodemask(m, &task->mems_allowed);
2551 seq_printf(m, "\n"); 2545 seq_printf(m, "\n");
diff --git a/kernel/sched.c b/kernel/sched.c
index e88689522e66..e5205811c19e 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -9335,10 +9335,6 @@ void __init sched_init(void)
9335#ifdef CONFIG_CPUMASK_OFFSTACK 9335#ifdef CONFIG_CPUMASK_OFFSTACK
9336 alloc_size += num_possible_cpus() * cpumask_size(); 9336 alloc_size += num_possible_cpus() * cpumask_size();
9337#endif 9337#endif
9338 /*
9339 * As sched_init() is called before page_alloc is setup,
9340 * we use alloc_bootmem().
9341 */
9342 if (alloc_size) { 9338 if (alloc_size) {
9343 ptr = (unsigned long)kzalloc(alloc_size, GFP_NOWAIT); 9339 ptr = (unsigned long)kzalloc(alloc_size, GFP_NOWAIT);
9344 9340