summaryrefslogtreecommitdiffstats
path: root/Add-option-to-automatically-enforce-module-signature.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-14 10:54:21 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-14 10:54:21 -0400
commit7f1b8a88fb1168d40d9c812ca4d71ba3655c9115 (patch)
treef5a34fd374b9d43c0bf6bb08ad0a6ee27ab6fc9a /Add-option-to-automatically-enforce-module-signature.patch
parentff180079f148953e56d8bac03c582df5e3343e45 (diff)
downloadkernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.tar.gz
kernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.tar.xz
kernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.zip
Linux v3.17-9283-g2d65a9f48fcd
Diffstat (limited to 'Add-option-to-automatically-enforce-module-signature.patch')
-rw-r--r--Add-option-to-automatically-enforce-module-signature.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch
index 9bf38ea02..9d3f95e4d 100644
--- a/Add-option-to-automatically-enforce-module-signature.patch
+++ b/Add-option-to-automatically-enforce-module-signature.patch
@@ -33,10 +33,10 @@ index 199f453cb4de..ec38acf00b40 100644
290/040 ALL edd_mbr_sig_buffer EDD MBR signatures
2D0/A00 ALL e820_map E820 memory map table
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 3eb8a41509b3..e46dc01f5904 100644
+index f2327e88e07c..4ba047a782fd 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
-@@ -1577,6 +1577,16 @@ config EFI_MIXED
+@@ -1607,6 +1607,16 @@ config EFI_MIXED
If unsure, say N.
@@ -129,10 +129,10 @@ index 225b0988043a..90dbfb73e11f 100644
* The sentinel is set to a nonzero value (0xff) in header.S.
*
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 41ead8d3bc0b..5a5cf7395724 100644
+index 235cfd39e0d7..13c0835f907a 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
-@@ -1142,6 +1142,12 @@ void __init setup_arch(char **cmdline_p)
+@@ -1151,6 +1151,12 @@ void __init setup_arch(char **cmdline_p)
io_delay_init();