Commit b7ae9dd8 authored Sep 16, 2005 by Heiko Carstens Committed by Linus Torvalds Sep 17, 2005

[PATCH] s390: show_cpuinfo fix



Disable preemption in show_cpuinfo to avoid problems and the warning about
smp_processor_id.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 90f4e121

arch/s390/kernel/setup.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -634,6 +634,7 @@ static int show_cpuinfo(struct seq_file m, void v)
		struct cpuinfo_S390 *cpuinfo;
		unsigned long n = (unsigned long) v - 1;

		preempt_disable();
		if (!n) {
		seq_printf(m, "vendor_id : IBM/S390\n"
		"# processors : %i\n"
		@@ -658,6 +659,7 @@ static int show_cpuinfo(struct seq_file m, void v)
		cpuinfo->cpu_id.ident,
		cpuinfo->cpu_id.machine);
		}
		preempt_enable();
		return 0;
		}