diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-29 11:24:25 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-29 11:24:25 -0400 |
| commit | 76c11d9b55366c6da11ee821716d56b68110a2c6 (patch) | |
| tree | b7eae841919f78db12d303d20863564b05bf3f33 /Add-sysrq-option-to-disable-secure-boot-mode.patch | |
| parent | c9229e16082bdc9b2f74a08bfdc77bcfed51df18 (diff) | |
| download | kernel-76c11d9b55366c6da11ee821716d56b68110a2c6.tar.gz kernel-76c11d9b55366c6da11ee821716d56b68110a2c6.tar.xz kernel-76c11d9b55366c6da11ee821716d56b68110a2c6.zip | |
Linux v4.1-11235-gc63f887bdae8
- Reenable debugging options.
Diffstat (limited to 'Add-sysrq-option-to-disable-secure-boot-mode.patch')
| -rw-r--r-- | Add-sysrq-option-to-disable-secure-boot-mode.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Add-sysrq-option-to-disable-secure-boot-mode.patch b/Add-sysrq-option-to-disable-secure-boot-mode.patch index 18c145132..af76163f6 100644 --- a/Add-sysrq-option-to-disable-secure-boot-mode.patch +++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch @@ -81,18 +81,18 @@ index 421e29e4cd81..61c1eb97806c 100644 input_set_drvdata(udev->dev, udev); diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c -index 1c4791033b72..04d5f0033564 100644 +index 2847108cc8dd..e8225c68dbc5 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c -@@ -464,6 +464,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = { - &sysrq_showstate_blocked_op, /* w */ +@@ -465,6 +465,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = { + /* x: May be registered on mips for TLB dump */ /* x: May be registered on ppc/powerpc for xmon */ /* x: May be registered on sparc64 for global PMU dump */ + /* x: May be registered on x86_64 for disabling secure boot */ NULL, /* x */ /* y: May be registered on sparc64 for global register dump */ NULL, /* y */ -@@ -507,7 +508,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p) +@@ -508,7 +509,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 1c4791033b72..04d5f0033564 100644 { struct sysrq_key_op *op_p; int orig_log_level; -@@ -527,11 +528,15 @@ void __handle_sysrq(int key, bool check_mask) +@@ -528,11 +529,15 @@ void __handle_sysrq(int key, bool check_mask) op_p = __sysrq_get_key_op(key); if (op_p) { @@ -118,7 +118,7 @@ index 1c4791033b72..04d5f0033564 100644 pr_cont("%s\n", op_p->action_msg); console_loglevel = orig_log_level; op_p->handler(key); -@@ -563,7 +568,7 @@ void __handle_sysrq(int key, bool check_mask) +@@ -564,7 +569,7 @@ void __handle_sysrq(int key, bool check_mask) void handle_sysrq(int key) { if (sysrq_on()) @@ -127,7 +127,7 @@ index 1c4791033b72..04d5f0033564 100644 } EXPORT_SYMBOL(handle_sysrq); -@@ -644,7 +649,7 @@ static void sysrq_do_reset(unsigned long _state) +@@ -645,7 +650,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 1c4791033b72..04d5f0033564 100644 if (sysrq_reset_downtime_ms) mod_timer(&state->keyreset_timer, -@@ -795,8 +800,10 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq, +@@ -796,8 +801,10 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq, default: if (sysrq->active && value && value != 2) { @@ -148,7 +148,7 @@ index 1c4791033b72..04d5f0033564 100644 } break; } -@@ -1076,7 +1083,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf, +@@ -1077,7 +1084,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf, if (get_user(c, buf)) return -EFAULT; @@ -228,7 +228,7 @@ index 4121345498e0..0ff3cef5df96 100644 return 0; diff --git a/kernel/module.c b/kernel/module.c -index e7065d683640..731d2653c60d 100644 +index 4c682ab7e640..9be8d9c03c90 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -107,9 +107,9 @@ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */ |