aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/mm
diff options
context:
space:
mode:
authorCarsten Otte <cotte@de.ibm.com>2011-12-27 05:27:11 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2011-12-27 05:27:10 -0500
commitf32269a0d09113b12b68f08dbc5361195176e2dc (patch)
tree989315d161294fd975000d12d3c5ea3834f8dc2e /arch/s390/mm
parent400d829153aea9487654f588d4d06e8beb8b251f (diff)
[S390] disable MACHINE_IS_VM check for pfault
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>
Diffstat (limited to 'arch/s390/mm')
-rw-r--r--arch/s390/mm/fault.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index a9a301866b3c..a9d3583922ec 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -509,7 +509,7 @@ int pfault_init(void)
509 .reserved = __PF_RES_FIELD }; 509 .reserved = __PF_RES_FIELD };
510 int rc; 510 int rc;
511 511
512 if (!MACHINE_IS_VM || pfault_disable) 512 if (pfault_disable)
513 return -1; 513 return -1;
514 asm volatile( 514 asm volatile(
515 " diag %1,%0,0x258\n" 515 " diag %1,%0,0x258\n"
@@ -530,7 +530,7 @@ void pfault_fini(void)
530 .refversn = 2, 530 .refversn = 2,
531 }; 531 };
532 532
533 if (!MACHINE_IS_VM || pfault_disable) 533 if (pfault_disable)
534 return; 534 return;
535 asm volatile( 535 asm volatile(
536 " diag %0,0,0x258\n" 536 " diag %0,0,0x258\n"
@@ -643,8 +643,6 @@ static int __init pfault_irq_init(void)
643{ 643{
644 int rc; 644 int rc;
645 645
646 if (!MACHINE_IS_VM)
647 return 0;
648 rc = register_external_interrupt(0x2603, pfault_interrupt); 646 rc = register_external_interrupt(0x2603, pfault_interrupt);
649 if (rc) 647 if (rc)
650 goto out_extint; 648 goto out_extint;