diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-30 13:01:28 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-30 13:01:28 -0400 |
| commit | 6a50f368784f29b0772f265a05b9e395bb2c23ff (patch) | |
| tree | 80faccf654cbbaae2a0a74686db514f663623bb2 /Add-option-to-automatically-enforce-module-signature.patch | |
| parent | 498236e304bc3f3c936ef937b2a101b9e22f6544 (diff) | |
| download | kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.tar.gz kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.tar.xz kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.zip | |
Linux v4.1-11355-g6aaf0da8728c
- Add patch to fix KVM sleeping in atomic issue (rhbz 1237143)
- Fix errant with_perf disable that removed perf entirely (rhbz 1237266)
Diffstat (limited to 'Add-option-to-automatically-enforce-module-signature.patch')
| -rw-r--r-- | Add-option-to-automatically-enforce-module-signature.patch | 8 |
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 b45244897..90cbddc8a 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 4fcf0ade7e91..0ea05e5528c9 100644 +index d05a42357ef0..6c218407e987 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -1692,6 +1692,16 @@ config EFI_MIXED +@@ -1696,6 +1696,16 @@ config EFI_MIXED If unsure, say N. @@ -54,7 +54,7 @@ index 4fcf0ade7e91..0ea05e5528c9 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 48304b89b601..2ff19014117a 100644 +index 2c82bd150d43..1ef8ea7f8ed9 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -12,6 +12,7 @@ @@ -103,7 +103,7 @@ index 48304b89b601..2ff19014117a 100644 /* * See if we have Graphics Output Protocol */ -@@ -1408,6 +1440,10 @@ struct boot_params *efi_main(struct efi_config *c, +@@ -1412,6 +1444,10 @@ struct boot_params *efi_main(struct efi_config *c, else setup_boot_services32(efi_early); |