summaryrefslogtreecommitdiffstats
path: root/Add-sysrq-option-to-disable-secure-boot-mode.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-03-19 16:01:37 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-03-19 16:05:37 -0400
commit287e820f027bbada27d1f5391f236be7a5721a57 (patch)
tree74446f08f0c35dce04078685d7775f122f6db414 /Add-sysrq-option-to-disable-secure-boot-mode.patch
parent1b5309d39e8b3a050579e7306f8f97e16d2fcd15 (diff)
downloadkernel-287e820f027bbada27d1f5391f236be7a5721a57.tar.gz
kernel-287e820f027bbada27d1f5391f236be7a5721a57.tar.xz
kernel-287e820f027bbada27d1f5391f236be7a5721a57.zip
Linux v4.0-rc4-88-g7b09ac704bac
- Rename arm64-xgbe-a0.patch
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 efb66ffa9..e37c83f25 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 64a123acb97f..2964c69e7c8e 100644
+index 26c5d54124c1..dab298f03a9c 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -70,6 +70,11 @@
@@ -30,7 +30,7 @@ index 64a123acb97f..2964c69e7c8e 100644
#include <video/edid.h>
#include <asm/mtrr.h>
-@@ -1292,6 +1297,37 @@ void __init i386_reserve_resources(void)
+@@ -1278,6 +1283,37 @@ void __init i386_reserve_resources(void)
#endif /* CONFIG_X86_32 */