lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] s390: show_cpuinfo fix

Browse Source 
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>
This commit is contained in:
Heiko Carstens
2005-09-16 19:27:34 -07:00
committed by Linus Torvalds
parent 90f4e12112
commit b7ae9dd80a
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/kernel/setup.c
View File

@@ -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)
cpuinfo->cpu_id.ident, cpuinfo->cpu_id.ident,
cpuinfo->cpu_id.machine); cpuinfo->cpu_id.machine);
} }
preempt_enable();
return 0; return 0;
} }