diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-01-29 16:06:31 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-01-29 16:06:31 -0500 |
| commit | f046ab9c33bfa5a5b3f07e73cd19ab862c4c7c89 (patch) | |
| tree | bdf772f62ecad7ebbcf563c259100c2056265283 /Add-option-to-automatically-enforce-module-signature.patch | |
| parent | 8821eb382431a47d224051f0fa50ae9bccffa96d (diff) | |
| download | kernel-f046ab9c33bfa5a5b3f07e73cd19ab862c4c7c89.tar.gz kernel-f046ab9c33bfa5a5b3f07e73cd19ab862c4c7c89.tar.xz kernel-f046ab9c33bfa5a5b3f07e73cd19ab862c4c7c89.zip | |
Refresh patches from f21 branch in the git tree
Diffstat (limited to 'Add-option-to-automatically-enforce-module-signature.patch')
| -rw-r--r-- | Add-option-to-automatically-enforce-module-signature.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch index e89f2df5..a4ceb74e 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 36327438caf0..61542c282e70 100644 +index 41a503c15862..7b8969db8398 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -1566,6 +1566,16 @@ config EFI_MIXED +@@ -1611,6 +1611,16 @@ config EFI_MIXED If unsure, say N. @@ -54,7 +54,7 @@ index 36327438caf0..61542c282e70 100644 def_bool y prompt "Enable seccomp to safely compute untrusted bytecode" diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c -index de8eebd6f67c..975d11bfaf5b 100644 +index 1acf605a646d..6da2da7ac9c3 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -12,6 +12,7 @@ @@ -65,7 +65,7 @@ index de8eebd6f67c..975d11bfaf5b 100644 #undef memcpy /* Use memcpy from misc.c */ -@@ -814,6 +815,37 @@ out: +@@ -828,6 +829,37 @@ out: return status; } @@ -103,7 +103,7 @@ index de8eebd6f67c..975d11bfaf5b 100644 /* * See if we have Graphics Output Protocol */ -@@ -1389,6 +1421,10 @@ struct boot_params *efi_main(struct efi_config *c, +@@ -1407,6 +1439,10 @@ struct boot_params *efi_main(struct efi_config *c, else setup_boot_services32(efi_early); @@ -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 ab08aa2276fb..f4eb99432db1 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -1142,6 +1142,12 @@ void __init setup_arch(char **cmdline_p) +@@ -1150,6 +1150,12 @@ void __init setup_arch(char **cmdline_p) io_delay_init(); @@ -163,7 +163,7 @@ index 341a73ecea2e..cca08ac450e2 100644 extern int modules_disabled; /* for sysctl */ diff --git a/kernel/module.c b/kernel/module.c -index f1d78afbe29f..ec12c156ea61 100644 +index 6507ffcb5445..cace4bd04956 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3845,6 +3845,13 @@ void module_layout(struct module *mod, |