5 files changed, 40 insertions, 44 deletions

diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
index def5caf8f72f..f6d9bcc0f75b 100644
--- a/arch/s390/kernel/machine_kexec.c
+++ b/arch/s390/kernel/machine_kexec.c
@@ -49,18 +49,12 @@ void machine_shutdown(void)
         printk(KERN_INFO "kexec: machine_shutdown called\n");
 }
 
-extern void pfault_fini(void);
-
 void machine_kexec(struct kimage *image)
 {
         relocate_kernel_t data_mover;
 
-        preempt_disable();
-#ifdef CONFIG_PFAULT
-        if (MACHINE_IS_VM)
-                pfault_fini();
-#endif
         smp_send_stop();
+        pfault_fini();
         s390_reset_system();
 
         data_mover = (relocate_kernel_t) page_to_phys(image->control_code_page);
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index b549a43ed08f..19090f7d4f51 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -460,8 +460,6 @@ __init smp_count_cpus(void)
  */
 extern void init_cpu_timer(void);
 extern void init_cpu_vtimer(void);
-extern int pfault_init(void);
-extern void pfault_fini(void);
 
 int __devinit start_secondary(void *cpuvoid)
 {
@@ -473,11 +471,9 @@ int __devinit start_secondary(void *cpuvoid)
 #ifdef CONFIG_VIRT_TIMER
         init_cpu_vtimer();
 #endif
-#ifdef CONFIG_PFAULT
         /* Enable pfault pseudo page faults on this cpu. */
-        if (MACHINE_IS_VM)
-                pfault_init();
-#endif
+        pfault_init();
+
         /* Mark this cpu as online */
         cpu_set(smp_processor_id(), cpu_online_map);
         /* Switch on interrupts */
@@ -667,11 +663,8 @@ __cpu_disable(void)
         }
         cpu_clear(cpu, cpu_online_map);
 
-#ifdef CONFIG_PFAULT
         /* Disable pfault pseudo page faults on this cpu. */
-        if (MACHINE_IS_VM)
-                pfault_fini();
-#endif
+        pfault_fini();
 
         memset(&cr_parms.orvals, 0, sizeof(cr_parms.orvals));
         memset(&cr_parms.andvals, 0xff, sizeof(cr_parms.andvals));
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index 92ecffbc8d82..475dbb884430 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -58,12 +58,6 @@ int sysctl_userprocess_debug = 0;
 
 extern pgm_check_handler_t do_protection_exception;
 extern pgm_check_handler_t do_dat_exception;
-#ifdef CONFIG_PFAULT
-extern int pfault_init(void);
-extern void pfault_fini(void);
-extern void pfault_interrupt(__u16 error_code);
-static ext_int_info_t ext_int_pfault;
-#endif
 extern pgm_check_handler_t do_monitor_call;
 
 #define stack_pointer ({ void **sp; asm("la %0,0(15)" : "=&d" (sp)); sp; })
@@ -739,22 +733,5 @@ void __init trap_init(void)
         pgm_check_table[0x1C] = &space_switch_exception;
         pgm_check_table[0x1D] = &hfp_sqrt_exception;
         pgm_check_table[0x40] = &do_monitor_call;
-
-        if (MACHINE_IS_VM) {
-#ifdef CONFIG_PFAULT
-                /*
-                 * Try to get pfault pseudo page faults going.
-                 */
-                if (register_early_external_interrupt(0x2603, pfault_interrupt,
-                                                      &ext_int_pfault) != 0)
-                        panic("Couldn't request external interrupt 0x2603");
-
-                if (pfault_init() == 0) 
-                        return;
-                
-                /* Tough luck, no pfault. */
-                unregister_early_external_interrupt(0x2603, pfault_interrupt,
-                                                    &ext_int_pfault);
-#endif
-        }
+        pfault_irq_init();
 }
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 1c323bbfda91..cd85e34d8703 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -31,6 +31,7 @@
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/kdebug.h>
+#include <asm/s390_ext.h>
 
 #ifndef CONFIG_64BIT
 #define __FAIL_ADDR_MASK 0x7ffff000
@@ -394,6 +395,7 @@ void do_dat_exception(struct pt_regs *regs, unsigned long error_code)
 /*
  * 'pfault' pseudo page faults routines.
  */
+static ext_int_info_t ext_int_pfault;
 static int pfault_disable = 0;
 
 static int __init nopfault(char *str)
@@ -422,7 +424,7 @@ int pfault_init(void)
                   __PF_RES_FIELD };
         int rc;
 
-        if (pfault_disable)
+        if (!MACHINE_IS_VM || pfault_disable)
                 return -1;
         asm volatile(
                 "       diag    %1,%0,0x258\n"
@@ -440,7 +442,7 @@ void pfault_fini(void)
         pfault_refbk_t refbk =
         { 0x258, 1, 5, 2, 0ULL, 0ULL, 0ULL, 0ULL };
 
-        if (pfault_disable)
+        if (!MACHINE_IS_VM || pfault_disable)
                 return;
         __ctl_clear_bit(0,9);
         asm volatile(
@@ -500,5 +502,25 @@ pfault_interrupt(__u16 error_code)
                         set_tsk_need_resched(tsk);
         }
 }
-#endif
 
+void __init pfault_irq_init(void)
+{
+        if (!MACHINE_IS_VM)
+                return;
+
+        /*
+         * Try to get pfault pseudo page faults going.
+         */
+        if (register_early_external_interrupt(0x2603, pfault_interrupt,
+                                              &ext_int_pfault) != 0)
+                panic("Couldn't request external interrupt 0x2603");
+
+        if (pfault_init() == 0)
+                return;
+
+        /* Tough luck, no pfault. */
+        pfault_disable = 1;
+        unregister_early_external_interrupt(0x2603, pfault_interrupt,
+                                            &ext_int_pfault);
+}
+#endif
diff --git a/include/asm-s390/system.h b/include/asm-s390/system.h
index ccbafe4bf2cb..bd0b05ae87d2 100644
--- a/include/asm-s390/system.h
+++ b/include/asm-s390/system.h
@@ -115,6 +115,16 @@ extern void account_system_vtime(struct task_struct *);
 #define account_vtime(x) do { /* empty */ } while (0)
 #endif
 
+#ifdef CONFIG_PFAULT
+extern void pfault_irq_init(void);
+extern int pfault_init(void);
+extern void pfault_fini(void);
+#else /* CONFIG_PFAULT */
+#define pfault_irq_init()       do { } while (0)
+#define pfault_init()           ({-1;})
+#define pfault_fini()           do { } while (0)
+#endif /* CONFIG_PFAULT */
+
 #define finish_arch_switch(prev) do {                                        \
         set_fs(current->thread.mm_segment);                                  \
         account_vtime(prev);                                                 \