diff --git a/executer/kernel/mcctrl/driver.c b/executer/kernel/mcctrl/driver.c
index 717c49c2..3db7a485 100644
--- a/executer/kernel/mcctrl/driver.c
+++ b/executer/kernel/mcctrl/driver.c
@@ -174,14 +174,6 @@ error_cleanup_channels:
 int mcctrl_os_shutdown_notifier(int os_index)
 {
 	if (os[os_index]) {
-		/* Wait for os running */
-		if (ihk_os_wait_for_status(os[os_index], IHK_OS_STATUS_RUNNING, 0, 200) != 0) {
-			printk("IHK: OS does not become RUNNING in shutdown. Force shutdown.\n");
-			/* send nmi to force shutdown */
-			ihk_os_send_nmi(os[os_index], 3);
-			mdelay(200);
-		}
-
 		pager_cleanup();
 		sysfsm_cleanup(os[os_index]);
 		free_topology_info(os[os_index]);
diff --git a/ihk b/ihk
index d1b9e0b6..c2715ee5 160000
--- a/ihk
+++ b/ihk
@@ -1 +1 @@
-Subproject commit d1b9e0b673fcd6d0f344dbf673ba37ce343bbe2b
+Subproject commit c2715ee51531a30ad28c65991d34f0c8b25d964c