diff options
| author | Carsten Otte <cotte@de.ibm.com> | 2011-12-27 11:27:11 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-12-27 11:27:10 +0100 |
| commit | f32269a0d09113b12b68f08dbc5361195176e2dc (patch) | |
| tree | 989315d161294fd975000d12d3c5ea3834f8dc2e /arch/s390/mm | |
| parent | 400d829153aea9487654f588d4d06e8beb8b251f (diff) | |
| download | linux-3.10-f32269a0d09113b12b68f08dbc5361195176e2dc.tar.gz linux-3.10-f32269a0d09113b12b68f08dbc5361195176e2dc.tar.bz2 linux-3.10-f32269a0d09113b12b68f08dbc5361195176e2dc.zip | |
[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.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index a9a301866b3..a9d3583922e 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -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; |