aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/setup.c
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2005-09-16 22:27:34 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-17 14:49:58 -0400
commitb7ae9dd80a3ecf070ea0c5fe1d405cd7687d6c51 (patch)
tree727056782a138c13b737dab933476b314d30643d /arch/s390/kernel/setup.c
parent90f4e12112284f1a41594e2950e6eced5b064efc (diff)
[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>
Diffstat (limited to 'arch/s390/kernel/setup.c')
-rw-r--r--arch/s390/kernel/setup.c2
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)
634 struct cpuinfo_S390 *cpuinfo; 634 struct cpuinfo_S390 *cpuinfo;
635 unsigned long n = (unsigned long) v - 1; 635 unsigned long n = (unsigned long) v - 1;
636 636
637 preempt_disable();
637 if (!n) { 638 if (!n) {
638 seq_printf(m, "vendor_id : IBM/S390\n" 639 seq_printf(m, "vendor_id : IBM/S390\n"
639 "# processors : %i\n" 640 "# processors : %i\n"
@@ -658,6 +659,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
658 cpuinfo->cpu_id.ident, 659 cpuinfo->cpu_id.ident,
659 cpuinfo->cpu_id.machine); 660 cpuinfo->cpu_id.machine);
660 } 661 }
662 preempt_enable();
661 return 0; 663 return 0;
662} 664}
663 665