summaryrefslogtreecommitdiffstats
path: root/Add-option-to-automatically-enforce-module-signature.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-03-19 16:01:37 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-03-19 16:05:37 -0400
commit287e820f027bbada27d1f5391f236be7a5721a57 (patch)
tree74446f08f0c35dce04078685d7775f122f6db414 /Add-option-to-automatically-enforce-module-signature.patch
parent1b5309d39e8b3a050579e7306f8f97e16d2fcd15 (diff)
downloadkernel-287e820f027bbada27d1f5391f236be7a5721a57.tar.gz
kernel-287e820f027bbada27d1f5391f236be7a5721a57.tar.xz
kernel-287e820f027bbada27d1f5391f236be7a5721a57.zip
Linux v4.0-rc4-88-g7b09ac704bac
- Rename arm64-xgbe-a0.patch
Diffstat (limited to 'Add-option-to-automatically-enforce-module-signature.patch')
-rw-r--r--Add-option-to-automatically-enforce-module-signature.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch
index 537565bcd..2e81ecf37 100644
--- a/Add-option-to-automatically-enforce-module-signature.patch
+++ b/Add-option-to-automatically-enforce-module-signature.patch
@@ -115,10 +115,10 @@ index ef17683484e9..105e7360d747 100644
setup_efi_pci(boot_params);
diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
-index 44e6dd7e36a2..3ddf4150bd9e 100644
+index 225b0988043a..90dbfb73e11f 100644
--- a/arch/x86/include/uapi/asm/bootparam.h
+++ b/arch/x86/include/uapi/asm/bootparam.h
-@@ -134,7 +134,8 @@ struct boot_params {
+@@ -133,7 +133,8 @@ struct boot_params {
__u8 eddbuf_entries; /* 0x1e9 */
__u8 edd_mbr_sig_buf_entries; /* 0x1ea */
__u8 kbd_status; /* 0x1eb */
@@ -129,10 +129,10 @@ index 44e6dd7e36a2..3ddf4150bd9e 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 98dc9317286e..26741d24797e 100644
+index 0a2421cca01f..a3d8174dedf9 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
-@@ -1165,6 +1165,12 @@ void __init setup_arch(char **cmdline_p)
+@@ -1151,6 +1151,12 @@ void __init setup_arch(char **cmdline_p)
io_delay_init();
@@ -146,7 +146,7 @@ index 98dc9317286e..26741d24797e 100644
* Parse the ACPI tables for possible boot-time SMP configuration.
*/
diff --git a/include/linux/module.h b/include/linux/module.h
-index 0c86ec9e10ed..b02dfaacc76c 100644
+index b033dab5c8bf..f526b6e02f59 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -188,6 +188,12 @@ const struct exception_table_entry *search_exception_tables(unsigned long add);