diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-04-14 09:54:01 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-04-14 09:55:36 -0400 |
| commit | b18e6e75364d806d76d99333646943f6765095fb (patch) | |
| tree | f31bd5d566a7562b1a7ee76c9eb80ca05505c675 /Add-option-to-automatically-enforce-module-signature.patch | |
| parent | 85afd6960d0e0ffdf5b153108bb0a4da2962812e (diff) | |
| download | kernel-b18e6e75364d806d76d99333646943f6765095fb.tar.gz kernel-b18e6e75364d806d76d99333646943f6765095fb.tar.xz kernel-b18e6e75364d806d76d99333646943f6765095fb.zip | |
Linux v4.0-2620-gb79013b2449c
Diffstat (limited to 'Add-option-to-automatically-enforce-module-signature.patch')
| -rw-r--r-- | Add-option-to-automatically-enforce-module-signature.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch index 97faf1a7e..c86a03912 100644 --- a/Add-option-to-automatically-enforce-module-signature.patch +++ b/Add-option-to-automatically-enforce-module-signature.patch @@ -33,10 +33,10 @@ index 82fbdbc1e0b0..a811210ad486 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 b7d31ca55187..ab403a636357 100644 +index faff6934c05a..4accc52523b4 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -1695,6 +1695,16 @@ config EFI_MIXED +@@ -1690,6 +1690,16 @@ config EFI_MIXED If unsure, say N. @@ -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 225b0988043a..90dbfb73e11f 100644 +index ab456dc233b5..74ba4083e7ce 100644 --- a/arch/x86/include/uapi/asm/bootparam.h +++ b/arch/x86/include/uapi/asm/bootparam.h -@@ -133,7 +133,8 @@ struct boot_params { +@@ -134,7 +134,8 @@ struct boot_params { __u8 eddbuf_entries; /* 0x1e9 */ __u8 edd_mbr_sig_buf_entries; /* 0x1ea */ __u8 kbd_status; /* 0x1eb */ @@ -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 0a2421cca01f..a3d8174dedf9 100644 +index d74ac33290ae..88dad730e858 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -1151,6 +1151,12 @@ void __init setup_arch(char **cmdline_p) +@@ -1156,6 +1156,12 @@ void __init setup_arch(char **cmdline_p) io_delay_init(); |