diff options
| author | Heiko Carstens | 2005-09-17 04:27:34 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-09-17 20:49:58 +0200 |
| commit | b7ae9dd80a3ecf070ea0c5fe1d405cd7687d6c51 (patch) | |
| tree | 727056782a138c13b737dab933476b314d30643d | |
| parent | [PATCH] s390: crypto driver patch take 2 (diff) | |
| download | kernel-qcow2-linux-b7ae9dd80a3ecf070ea0c5fe1d405cd7687d6c51.tar.gz kernel-qcow2-linux-b7ae9dd80a3ecf070ea0c5fe1d405cd7687d6c51.tar.xz kernel-qcow2-linux-b7ae9dd80a3ecf070ea0c5fe1d405cd7687d6c51.zip | |
[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>
| -rw-r--r-- | arch/s390/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 5ba5a5485da9..907d16ac9dc9 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -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; } |