openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Carsten Otte 2011-12-27 11:27:11 +01:00 committed by Martin Schwidefsky
parent 400d829153
commit f32269a0d0
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/s390/mm/fault.c
View File

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