Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d01d4827 authored by Heiko Carstens's avatar Heiko Carstens Committed by Ingo Molnar
Browse files

sched: Always show Cpus_allowed field in /proc/<pid>/status 



The Cpus_allowed fields in /proc/<pid>/status is currently only
shown in case of CONFIG_CPUSETS. However their contents are also
useful for the !CONFIG_CPUSETS case.

So change the current behaviour and always show these fields.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20090921090627.GD4649@osiris.boeblingen.de.ibm.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 0d721cea

fs/proc/array.c

+11 −0
Original line number Diff line number Diff line
@@ -321,6 +321,16 @@ static inline void task_context_switch_counts(struct seq_file *m, 
			p->nivcsw);

}



static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)

{

	seq_printf(m, "Cpus_allowed:\t");

	seq_cpumask(m, &task->cpus_allowed);

	seq_printf(m, "\n");

	seq_printf(m, "Cpus_allowed_list:\t");

	seq_cpumask_list(m, &task->cpus_allowed);

	seq_printf(m, "\n");

}



int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,

			struct pid *pid, struct task_struct *task)

{
@@ -335,6 +345,7 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, 
	}

	task_sig(m, task);

	task_cap(m, task);

	task_cpus_allowed(m, task);

	cpuset_task_status_allowed(m, task);

#if defined(CONFIG_S390)

	task_show_regs(m, task);

kernel/cpuset.c

+1 −7
Original line number Diff line number Diff line
@@ -2499,15 +2499,9 @@ const struct file_operations proc_cpuset_operations = { 
};

#endif /* CONFIG_PROC_PID_CPUSET */



/* Display task cpus_allowed, mems_allowed in /proc/<pid>/status file. */

/* Display task mems_allowed in /proc/<pid>/status file. */

void cpuset_task_status_allowed(struct seq_file *m, struct task_struct *task)

{

	seq_printf(m, "Cpus_allowed:\t");

	seq_cpumask(m, &task->cpus_allowed);

	seq_printf(m, "\n");

	seq_printf(m, "Cpus_allowed_list:\t");

	seq_cpumask_list(m, &task->cpus_allowed);

	seq_printf(m, "\n");

	seq_printf(m, "Mems_allowed:\t");

	seq_nodemask(m, &task->mems_allowed);

	seq_printf(m, "\n");