CHROMIUM: sysrq: fix Chrome OS specific 'x' key handler to work on ARM

The current handler generates a NULL pointer derefence so you are relying
on a side-effect for the panic. Instead, just call panic directly.

BUG=chromium-os:33505
TEST=alt-F10-x now works on ARM

Change-Id: Ie980a68be4be38b2d80c01b808ccdbc9aaf9bd76
Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/30025
Reviewed-by: Sameer Nanda <snanda@chromium.org>

diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index 9a91f29..4796af7 100644 (file)
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -404,7 +404,7 @@ static void sysrq_handle_cros_xkey(int key)
        sysrq_handle_showstate_blocked(key);
        sysrq_handle_sync(key);
        mdelay(1000); /* Delay for a bit to give time for sync to complete */
-       sysrq_handle_crash(key);
+       panic("ChromeOS X Key");
 }
 
 static struct sysrq_key_op sysrq_cros_xkey = {