diff --git a/[refs] b/[refs] index f4f5acda19ec..03ff9eb52933 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74ae3221818eaf3884ceac931ba3cd2c00045483 +refs/heads/master: b2e9c7d07fcc8966d6aa50a77afa66c9919bd5a8 diff --git a/trunk/drivers/char/sysrq.c b/trunk/drivers/char/sysrq.c index 0ad6cb081db4..6b4d4d1e343d 100644 --- a/trunk/drivers/char/sysrq.c +++ b/trunk/drivers/char/sysrq.c @@ -113,6 +113,7 @@ static struct sysrq_key_op sysrq_crashdump_op = { static void sysrq_handle_reboot(int key, struct pt_regs *pt_regs, struct tty_struct *tty) { + lockdep_off(); local_irq_enable(); emergency_restart(); }