diff --git a/kernel/reboot.c b/kernel/reboot.c index a6ad5eb2fa73..5cf5009f276e 100644 --- a/kernel/reboot.c +++ b/kernel/reboot.c @@ -413,7 +413,7 @@ void ctrl_alt_del(void) if (C_A_D) schedule_work(&cad_work); else - kill_cad_pid(SIGINT, 1); + pr_info("Ignored %s()\n", __func__); } char poweroff_cmd[POWEROFF_CMD_PATH_LEN] = "/sbin/poweroff"; diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c index 7998affa45d4..64f9ede6834e 100644 --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c @@ -530,6 +530,8 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action, retval = -ENOENT; goto exit; } + if (strstr(devpath, "/dummy")) + schedule_timeout_uninterruptible(HZ / 10); /* default keys */ retval = add_uevent_var(env, "ACTION=%s", action_string);