diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-14 10:54:21 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-14 10:54:21 -0400 |
commit | 7f1b8a88fb1168d40d9c812ca4d71ba3655c9115 (patch) | |
tree | f5a34fd374b9d43c0bf6bb08ad0a6ee27ab6fc9a /Add-sysrq-option-to-disable-secure-boot-mode.patch | |
parent | ff180079f148953e56d8bac03c582df5e3343e45 (diff) | |
download | kernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.tar.gz kernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.tar.xz kernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.zip |
Linux v3.17-9283-g2d65a9f48fcd
Diffstat (limited to 'Add-sysrq-option-to-disable-secure-boot-mode.patch')
-rw-r--r-- | Add-sysrq-option-to-disable-secure-boot-mode.patch | 4 |
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 fc59af3c1..ca9c990e4 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 fb282ff6a802..d291d16ba257 100644 +index fbae2bf99a47..f3960a8c2627 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -70,6 +70,11 @@ @@ -30,7 +30,7 @@ index fb282ff6a802..d291d16ba257 100644 #include <video/edid.h> #include <asm/mtrr.h> -@@ -1268,6 +1273,37 @@ void __init i386_reserve_resources(void) +@@ -1277,6 +1282,37 @@ void __init i386_reserve_resources(void) #endif /* CONFIG_X86_32 */ |