diff options
| author | Adam Williamson <awilliam@redhat.com> | 2014-11-08 14:59:30 -0800 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2014-11-08 14:59:30 -0800 |
| commit | 89b19396f6c5dd09eaf8f44bcee27d42a2da1502 (patch) | |
| tree | 317c2721f3a641d3a9308c512532bfb384a4df06 /Add-sysrq-option-to-disable-secure-boot-mode.patch | |
| parent | c2e2a0849b034d919e0c2e27c36d77697579eb6b (diff) | |
| parent | b1223bfd6a6dd0bec9b3c0df7b286b22bcc35257 (diff) | |
| download | kernel-89b19396f6c5dd09eaf8f44bcee27d42a2da1502.tar.gz kernel-89b19396f6c5dd09eaf8f44bcee27d42a2da1502.tar.xz kernel-89b19396f6c5dd09eaf8f44bcee27d42a2da1502.zip | |
Merge branch 'master' into baytrail (3.18 bump)
Diffstat (limited to 'Add-sysrq-option-to-disable-secure-boot-mode.patch')
| -rw-r--r-- | Add-sysrq-option-to-disable-secure-boot-mode.patch | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Add-sysrq-option-to-disable-secure-boot-mode.patch b/Add-sysrq-option-to-disable-secure-boot-mode.patch index 5dd86ceb8..4b1cff847 100644 --- a/Add-sysrq-option-to-disable-secure-boot-mode.patch +++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch @@ -1,4 +1,3 @@ -From 2c6e707e281b5bd3277b10cdfb9fdde74df97561 Mon Sep 17 00:00:00 2001 From: Kyle McMartin <kyle@redhat.com> Date: Fri, 30 Aug 2013 09:28:51 -0400 Subject: [PATCH] Add sysrq option to disable secure boot mode @@ -16,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 bc31a43b31a0..5f80d12a55cb 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -70,6 +70,11 @@ @@ -31,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 */ @@ -229,7 +228,7 @@ index 379650b984f8..070f29fefdc2 100644 return 0; diff --git a/kernel/module.c b/kernel/module.c -index 866417ecc76a..d7ca95c5a349 100644 +index cace4bd04956..a33be993df25 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -108,9 +108,9 @@ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */ |