diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-26 09:33:38 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-26 09:33:38 -0400 |
| commit | 35eff41288ccf2a1ddd555db0b0e51906af970a0 (patch) | |
| tree | 761d7f671ba27b4a314aa72a864f9a3a56dc7d5b /Add-sysrq-option-to-disable-secure-boot-mode.patch | |
| parent | 21694f1b769f352163ed762b519cc7155dd1c97d (diff) | |
| download | kernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.tar.gz kernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.tar.xz kernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.zip | |
Linux v4.1-5596-gaefbef10e3ae
Diffstat (limited to 'Add-sysrq-option-to-disable-secure-boot-mode.patch')
| -rw-r--r-- | Add-sysrq-option-to-disable-secure-boot-mode.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Add-sysrq-option-to-disable-secure-boot-mode.patch b/Add-sysrq-option-to-disable-secure-boot-mode.patch index 8c7c071d3..18c145132 100644 --- a/Add-sysrq-option-to-disable-secure-boot-mode.patch +++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch @@ -15,7 +15,7 @@ Upstream-status: Fedora mustard 7 files changed, 65 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index d99c8c38914f..bfb77c4faae6 100644 +index 9bcd51050511..0290275eaaf8 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -70,6 +70,11 @@ @@ -30,7 +30,7 @@ index d99c8c38914f..bfb77c4faae6 100644 #include <video/edid.h> #include <asm/mtrr.h> -@@ -1283,6 +1288,37 @@ void __init i386_reserve_resources(void) +@@ -1287,6 +1292,37 @@ void __init i386_reserve_resources(void) #endif /* CONFIG_X86_32 */ @@ -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 843f2cdc280b..13a5a3843d4c 100644 +index 1c4791033b72..04d5f0033564 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c -@@ -465,6 +465,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 843f2cdc280b..13a5a3843d4c 100644 NULL, /* x */ /* y: May be registered on sparc64 for global register dump */ NULL, /* y */ -@@ -508,7 +509,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 843f2cdc280b..13a5a3843d4c 100644 { struct sysrq_key_op *op_p; int orig_log_level; -@@ -528,11 +529,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) { @@ -118,7 +118,7 @@ index 843f2cdc280b..13a5a3843d4c 100644 pr_cont("%s\n", op_p->action_msg); console_loglevel = orig_log_level; op_p->handler(key); -@@ -564,7 +569,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()) @@ -148,7 +148,7 @@ index 843f2cdc280b..13a5a3843d4c 100644 } break; } -@@ -1091,7 +1098,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf, +@@ -1076,7 +1083,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf, if (get_user(c, buf)) return -EFAULT; |