]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[S390] disable MACHINE_IS_VM check for pfault
authorCarsten Otte <cotte@de.ibm.com>
Thu, 17 Nov 2011 08:54:22 +0000 (09:54 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Thu, 17 Nov 2011 08:54:20 +0000 (09:54 +0100)
This patch disables the check for MACHINE_IS_VM when initializing the
pfault infrastructure. The code checks for successful completion of
diag 258 anyway, thus it's safe to try initialization on LPAR anyway.
This is needed to use pfault on kvm

Signed-off-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
arch/s390/mm/fault.c

index a9a301866b3c1846f37792aa371620e2b3004415..a9d3583922eca0be654fd42b4bcf644339098f57 100644 (file)
@@ -509,7 +509,7 @@ int pfault_init(void)
                .reserved = __PF_RES_FIELD };
         int rc;
 
-       if (!MACHINE_IS_VM || pfault_disable)
+       if (pfault_disable)
                return -1;
        asm volatile(
                "       diag    %1,%0,0x258\n"
@@ -530,7 +530,7 @@ void pfault_fini(void)
                .refversn = 2,
        };
 
-       if (!MACHINE_IS_VM || pfault_disable)
+       if (pfault_disable)
                return;
        asm volatile(
                "       diag    %0,0,0x258\n"
@@ -643,8 +643,6 @@ static int __init pfault_irq_init(void)
 {
        int rc;
 
-       if (!MACHINE_IS_VM)
-               return 0;
        rc = register_external_interrupt(0x2603, pfault_interrupt);
        if (rc)
                goto out_extint;