diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-12 12:53:25 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-12 12:53:25 -0500 |
| commit | fe6305dc490a4abd630b3bbe6a9b1e8cb6e37bb8 (patch) | |
| tree | 53cfdb46981edc2e8364a37aa77c03b84c1ab2c8 /Add-sysrq-option-to-disable-secure-boot-mode.patch | |
| parent | a281db65717544f11d8b1d8a221a60d522e03628 (diff) | |
| download | kernel-fe6305dc490a4abd630b3bbe6a9b1e8cb6e37bb8.tar.gz kernel-fe6305dc490a4abd630b3bbe6a9b1e8cb6e37bb8.tar.xz kernel-fe6305dc490a4abd630b3bbe6a9b1e8cb6e37bb8.zip | |
Linux v3.19-4542-g8cc748aa76c9
Diffstat (limited to 'Add-sysrq-option-to-disable-secure-boot-mode.patch')
| -rw-r--r-- | Add-sysrq-option-to-disable-secure-boot-mode.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Add-sysrq-option-to-disable-secure-boot-mode.patch b/Add-sysrq-option-to-disable-secure-boot-mode.patch index d7ba52a58..2585d7dd1 100644 --- a/Add-sysrq-option-to-disable-secure-boot-mode.patch +++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch @@ -81,10 +81,10 @@ index 421e29e4cd81..61c1eb97806c 100644 input_set_drvdata(udev->dev, udev); diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c -index 42bad18c66c9..496e073b09d7 100644 +index 259a4d5a4e8f..512c21dcb86f 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c -@@ -463,6 +463,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = { +@@ -464,6 +464,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = { &sysrq_showstate_blocked_op, /* w */ /* x: May be registered on ppc/powerpc for xmon */ /* x: May be registered on sparc64 for global PMU dump */ @@ -92,7 +92,7 @@ index 42bad18c66c9..496e073b09d7 100644 NULL, /* x */ /* y: May be registered on sparc64 for global register dump */ NULL, /* y */ -@@ -506,7 +507,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p) +@@ -507,7 +508,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p) sysrq_key_table[i] = op_p; } @@ -101,7 +101,7 @@ index 42bad18c66c9..496e073b09d7 100644 { struct sysrq_key_op *op_p; int orig_log_level; -@@ -526,11 +527,15 @@ void __handle_sysrq(int key, bool check_mask) +@@ -527,11 +528,15 @@ void __handle_sysrq(int key, bool check_mask) op_p = __sysrq_get_key_op(key); if (op_p) { @@ -115,10 +115,10 @@ index 42bad18c66c9..496e073b09d7 100644 */ - if (!check_mask || sysrq_on_mask(op_p->enable_mask)) { + if (from == SYSRQ_FROM_KERNEL || sysrq_on_mask(op_p->enable_mask)) { - printk("%s\n", op_p->action_msg); + pr_cont("%s\n", op_p->action_msg); console_loglevel = orig_log_level; op_p->handler(key); -@@ -562,7 +567,7 @@ void __handle_sysrq(int key, bool check_mask) +@@ -563,7 +568,7 @@ void __handle_sysrq(int key, bool check_mask) void handle_sysrq(int key) { if (sysrq_on()) @@ -127,7 +127,7 @@ index 42bad18c66c9..496e073b09d7 100644 } EXPORT_SYMBOL(handle_sysrq); -@@ -642,7 +647,7 @@ static void sysrq_do_reset(unsigned long _state) +@@ -643,7 +648,7 @@ static void sysrq_do_reset(unsigned long _state) static void sysrq_handle_reset_request(struct sysrq_state *state) { if (state->reset_requested) @@ -136,7 +136,7 @@ index 42bad18c66c9..496e073b09d7 100644 if (sysrq_reset_downtime_ms) mod_timer(&state->keyreset_timer, -@@ -793,8 +798,10 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq, +@@ -794,8 +799,10 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq, default: if (sysrq->active && value && value != 2) { @@ -148,7 +148,7 @@ index 42bad18c66c9..496e073b09d7 100644 } break; } -@@ -1089,7 +1096,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf, +@@ -1090,7 +1097,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf, if (get_user(c, buf)) return -EFAULT; |