diff --git a/[refs] b/[refs] index 1b0a77b462a2..09af0177cb64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d9f34ad366a7935be3d6e7cca90805e6b7a692d +refs/heads/master: 8c64580d522542e50f2ba689316128b7fbae497b diff --git a/trunk/drivers/char/sysrq.c b/trunk/drivers/char/sysrq.c index e31f079400fa..ee3ca8f1768e 100644 --- a/trunk/drivers/char/sysrq.c +++ b/trunk/drivers/char/sysrq.c @@ -147,12 +147,13 @@ static struct sysrq_key_op sysrq_mountro_op = { .enable_mask = SYSRQ_ENABLE_REMOUNT, }; -#ifdef CONFIG_DEBUG_MUTEXES +#ifdef CONFIG_LOCKDEP static void sysrq_handle_showlocks(int key, struct pt_regs *pt_regs, struct tty_struct *tty) { debug_show_all_locks(); } + static struct sysrq_key_op sysrq_showlocks_op = { .handler = sysrq_handle_showlocks, .help_msg = "show-all-locks(D)",