summaryrefslogtreecommitdiffstats
path: root/Add-sysrq-option-to-disable-secure-boot-mode.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-01-12 11:36:21 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-01-12 11:36:21 -0500
commit0a8b8ae94082533d61502474ef5c96086739acbc (patch)
tree71765e7ceea894781359e9cfddee66a0cd886b70 /Add-sysrq-option-to-disable-secure-boot-mode.patch
parentb556dbd0ada30c80284146c06452bb045979e0a6 (diff)
downloadkernel-0a8b8ae94082533d61502474ef5c96086739acbc.tar.gz
kernel-0a8b8ae94082533d61502474ef5c96086739acbc.tar.xz
kernel-0a8b8ae94082533d61502474ef5c96086739acbc.zip
Linux v3.19-rc4
- Disable 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.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/Add-sysrq-option-to-disable-secure-boot-mode.patch b/Add-sysrq-option-to-disable-secure-boot-mode.patch
index ef8827fda..174227f93 100644
--- a/Add-sysrq-option-to-disable-secure-boot-mode.patch
+++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch
@@ -215,15 +215,15 @@ index 387fa7d05c98..4b07e30b3279 100644
int unregister_sysrq_key(int key, struct sysrq_key_op *op);
struct sysrq_key_op *__sysrq_get_key_op(int key);
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
-index 379650b984f8..070f29fefdc2 100644
+index f191bddf64b8..0cf8a7d49b91 100644
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
-@@ -1924,7 +1924,7 @@ static int kdb_sr(int argc, const char **argv)
- if (argc != 1)
+@@ -1968,7 +1968,7 @@ static int kdb_sr(int argc, const char **argv)
return KDB_ARGCOUNT;
+
kdb_trap_printk++;
-- __handle_sysrq(*argv[1], false);
-+ __handle_sysrq(*argv[1], SYSRQ_FROM_KERNEL);
+- __handle_sysrq(*argv[1], check_mask);
++ __handle_sysrq(*argv[1], check_mask & SYSRQ_FROM_KERNEL);
kdb_trap_printk--;
return 0;