Merge branch 'master' of /home/src/linux-2.6/

1 files changed, 5 insertions, 0 deletions

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 5ba5a5485da9..5204778b8e5e 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -261,8 +261,11 @@ void (*_machine_power_off)(void) = machine_power_off_smp;
  * Reboot, halt and power_off routines for non SMP.
  */
 extern void reipl(unsigned long devno);
+extern void reipl_diag(void);
 static void do_machine_restart_nonsmp(char * __unused)
 {
+        reipl_diag();
+
         if (MACHINE_IS_VM)
                 cpcmd ("IPL", NULL, 0);
         else
@@ -634,6 +637,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 +662,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                                cpuinfo->cpu_id.ident,
                                cpuinfo->cpu_id.machine);
         }
+        preempt_enable();
         return 0;
 }