* [patch 5/7] s390: show_cpuinfo fix.
@ 2005-09-14 15:54 Martin Schwidefsky
0 siblings, 0 replies; only message in thread
From: Martin Schwidefsky @ 2005-09-14 15:54 UTC (permalink / raw)
To: akpm, heiko.carstens, linux-kernel
[patch 5/7] s390: show_cpuinfo fix.
From: Heiko Carstens <heiko.carstens@de.ibm.com>
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>
diffstat:
arch/s390/kernel/setup.c | 2 ++
1 files changed, 2 insertions(+)
diff -urpN linux-2.6/arch/s390/kernel/setup.c linux-2.6-patched/arch/s390/kernel/setup.c
--- linux-2.6/arch/s390/kernel/setup.c 2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6-patched/arch/s390/kernel/setup.c 2005-09-14 16:48:17.000000000 +0200
@@ -634,6 +634,7 @@ static int show_cpuinfo(struct seq_file
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
cpuinfo->cpu_id.ident,
cpuinfo->cpu_id.machine);
}
+ preempt_enable();
return 0;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-09-14 15:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-09-14 15:54 [patch 5/7] s390: show_cpuinfo fix Martin Schwidefsky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®