summaryrefslogtreecommitdiffstats
path: root/Add-sysrq-option-to-disable-secure-boot-mode.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-02-11 09:17:16 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-02-11 09:17:16 -0500
commit1ef071e4db9c7521712667bb991dae3fa9dc90cb (patch)
tree2202620683d96ac918bebc4fb30f4af9dd963038 /Add-sysrq-option-to-disable-secure-boot-mode.patch
parent7681e91720563c3046df47d3fe585be3e441409a (diff)
downloadkernel-1ef071e4db9c7521712667bb991dae3fa9dc90cb.tar.gz
kernel-1ef071e4db9c7521712667bb991dae3fa9dc90cb.tar.xz
kernel-1ef071e4db9c7521712667bb991dae3fa9dc90cb.zip
Linux v3.19-463-g3e8c04eb1174
- Reenable debugging options. - Temporarily disable aarch64 patches
Diffstat (limited to 'Add-sysrq-option-to-disable-secure-boot-mode.patch')
-rw-r--r--Add-sysrq-option-to-disable-secure-boot-mode.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/Add-sysrq-option-to-disable-secure-boot-mode.patch b/Add-sysrq-option-to-disable-secure-boot-mode.patch
index bbd41f249..d7ba52a58 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 b40d6174242f..0ee7749bad74 100644
+index c5a7fe1c197c..f476de69248d 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -70,6 +70,11 @@
@@ -30,7 +30,7 @@ index b40d6174242f..0ee7749bad74 100644
#include <video/edid.h>
#include <asm/mtrr.h>
-@@ -1277,6 +1282,37 @@ void __init i386_reserve_resources(void)
+@@ -1275,6 +1280,37 @@ void __init i386_reserve_resources(void)
#endif /* CONFIG_X86_32 */