diff mbox

[v3,5/5] fast-reboot: remove CAPI check

Message ID 7ca60efe1ecc4a20da8d2e6aad57dfde8e7b5650.1485502358.git-series.andrew.donnellan@au1.ibm.com
State Accepted
Headers show

Commit Message

Andrew Donnellan Jan. 27, 2017, 7:33 a.m. UTC
Now that we can handle disabling CAPI mode on PHBs, we don't need to
disable fast reboot if there's a CAPI mode PHB.

Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
---
 core/fast-reboot.c | 12 ------------
 1 file changed, 12 deletions(-)
diff mbox

Patch

diff --git a/core/fast-reboot.c b/core/fast-reboot.c
index eec6021..41e87e3 100644
--- a/core/fast-reboot.c
+++ b/core/fast-reboot.c
@@ -312,7 +312,6 @@  void fast_reboot(void)
 {
 	bool success;
 	static int fast_reboot_count = 0;
-	struct proc_chip *chip;
 
 	if (proc_gen != proc_gen_p8) {
 		prlog(PR_DEBUG,
@@ -334,17 +333,6 @@  void fast_reboot(void)
 	}
 	unlock(&fast_reboot_disabled_lock);
 
-	lock(&capi_lock);
-	for_each_chip(chip) {
-		if (chip->capp_phb3_attached_mask) {
-			prlog(PR_NOTICE,
-			      "RESET: CAPP attached, cannot fast reboot\n");
-			unlock(&capi_lock);
-			return;
-		}
-	}
-	unlock(&capi_lock);
-
 	prlog(PR_NOTICE, "RESET: Initiating fast reboot %d...\n", ++fast_reboot_count);
 	free(fdt);