diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-16 10:01:09 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-16 10:01:09 -0500 |
| commit | f1193f2c7556c2f1a74c3b6f16320a6d899806d9 (patch) | |
| tree | 6a6107b0e900f3eb78cf61ba8ceeda44a6307ba3 /Add-sysrq-option-to-disable-secure-boot-mode.patch | |
| parent | 87b2a17d8cd45e1bb04d49c89ae7af476bcd917c (diff) | |
| download | kernel-f1193f2c7556c2f1a74c3b6f16320a6d899806d9.tar.gz kernel-f1193f2c7556c2f1a74c3b6f16320a6d899806d9.tar.xz kernel-f1193f2c7556c2f1a74c3b6f16320a6d899806d9.zip | |
Linux v3.19-6676-g1fa185ebcbce
Diffstat (limited to 'Add-sysrq-option-to-disable-secure-boot-mode.patch')
| -rw-r--r-- | Add-sysrq-option-to-disable-secure-boot-mode.patch | 8 |
1 files changed, 4 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 2585d7dd1..f94b2f117 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 c5a7fe1c197c..f476de69248d 100644 +index f96581df9c45..495b30ab31d6 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -70,6 +70,11 @@ @@ -30,7 +30,7 @@ index c5a7fe1c197c..f476de69248d 100644 #include <video/edid.h> #include <asm/mtrr.h> -@@ -1275,6 +1280,37 @@ void __init i386_reserve_resources(void) +@@ -1278,6 +1283,37 @@ void __init i386_reserve_resources(void) #endif /* CONFIG_X86_32 */ @@ -228,10 +228,10 @@ index 7b40c5f07dce..8a60477b96e1 100644 return 0; diff --git a/kernel/module.c b/kernel/module.c -index 6244f24abe27..b77554170d76 100644 +index ad861480c8e4..7f4745c58671 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -107,9 +107,9 @@ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */ +@@ -108,9 +108,9 @@ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */ #ifdef CONFIG_MODULE_SIG #ifdef CONFIG_MODULE_SIG_FORCE |