summaryrefslogtreecommitdiffstats
path: root/Add-option-to-automatically-enforce-module-signature.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-11-03 10:15:39 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2014-11-03 10:15:39 -0500
commita011ddd4b5885228de2005537824815a467d26ca (patch)
tree0d95cc3d51b761c9b4fa304101a86c9516ce0eae /Add-option-to-automatically-enforce-module-signature.patch
parent3b752c8c75943ec9feb71be1a64b6522989bcf75 (diff)
downloadkernel-a011ddd4b5885228de2005537824815a467d26ca.tar.gz
kernel-a011ddd4b5885228de2005537824815a467d26ca.tar.xz
kernel-a011ddd4b5885228de2005537824815a467d26ca.zip
Linux v3.18-rc3
- Disable debugging options.
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 7cc669c15..852cd77ec 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 f2327e88e07c..4ba047a782fd 100644
+index ded8a6774ac9..750d32268fb1 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
-@@ -1607,6 +1607,16 @@ config EFI_MIXED
+@@ -1611,6 +1611,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 235cfd39e0d7..13c0835f907a 100644
+index ab08aa2276fb..f4eb99432db1 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
-@@ -1151,6 +1151,12 @@ void __init setup_arch(char **cmdline_p)
+@@ -1150,6 +1150,12 @@ void __init setup_arch(char **cmdline_p)
io_delay_init();