Commit b7ae9dd8 authored by Heiko Carstens's avatar Heiko Carstens Committed by Linus Torvalds

[PATCH] s390: show_cpuinfo fix

Disable preemption in show_cpuinfo to avoid problems and the warning about
smp_processor_id.
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 90f4e121
...@@ -634,6 +634,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) ...@@ -634,6 +634,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
struct cpuinfo_S390 *cpuinfo; struct cpuinfo_S390 *cpuinfo;
unsigned long n = (unsigned long) v - 1; unsigned long n = (unsigned long) v - 1;
preempt_disable();
if (!n) { if (!n) {
seq_printf(m, "vendor_id : IBM/S390\n" seq_printf(m, "vendor_id : IBM/S390\n"
"# processors : %i\n" "# processors : %i\n"
...@@ -658,6 +659,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) ...@@ -658,6 +659,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
cpuinfo->cpu_id.ident, cpuinfo->cpu_id.ident,
cpuinfo->cpu_id.machine); cpuinfo->cpu_id.machine);
} }
preempt_enable();
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment