---

yaml --- r: 280619 b: refs/heads/master c: f32269a h: refs/heads/master i: 280617: 57c197a 280615: e1fbe00 v: v3
git-mirror · Dec 27, 2011 · 60453a3 · 60453a3
1 parent 5eff608
commit 60453a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 400d829153aea9487654f588d4d06e8beb8b251f
+refs/heads/master: f32269a0d09113b12b68f08dbc5361195176e2dc
diff --git a/trunk/arch/s390/mm/fault.c b/trunk/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;