Merge with /home/shaggy/git/linus-clean/

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index da77f001af8d..85222fee4361 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -537,7 +537,8 @@ int __devinit start_secondary(void *cpuvoid)
 #endif
 #ifdef CONFIG_PFAULT
         /* Enable pfault pseudo page faults on this cpu. */
-        pfault_init();
+        if (MACHINE_IS_VM)
+                pfault_init();
 #endif
         /* Mark this cpu as online */
         cpu_set(smp_processor_id(), cpu_online_map);
@@ -690,7 +691,8 @@ __cpu_disable(void)
 
 #ifdef CONFIG_PFAULT
         /* Disable pfault pseudo page faults on this cpu. */
-        pfault_fini();
+        if (MACHINE_IS_VM)
+                pfault_fini();
 #endif
 
         /* disable all external interrupts */