diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-07-06 16:34:35 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-07-06 16:34:35 -0400 |
commit | 088a50c52e6f720fdbd321871fb3e30e241508c5 (patch) | |
tree | 1a71348d2e970f1d6f8a1f824935e54d64d00040 /Add-sysrq-option-to-disable-secure-boot-mode.patch | |
parent | 55b5c15b8f0c65f111c9fb61b839024d0502798c (diff) | |
download | kernel-088a50c52e6f720fdbd321871fb3e30e241508c5.tar.gz kernel-088a50c52e6f720fdbd321871fb3e30e241508c5.tar.xz kernel-088a50c52e6f720fdbd321871fb3e30e241508c5.zip |
Linux v4.2-rc1
- Disable debug options.
- Add patch to fix perf build
Diffstat (limited to 'Add-sysrq-option-to-disable-secure-boot-mode.patch')
-rw-r--r-- | Add-sysrq-option-to-disable-secure-boot-mode.patch | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/Add-sysrq-option-to-disable-secure-boot-mode.patch b/Add-sysrq-option-to-disable-secure-boot-mode.patch index af76163f6..236aecf8a 100644 --- a/Add-sysrq-option-to-disable-secure-boot-mode.patch +++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch @@ -11,11 +11,11 @@ Upstream-status: Fedora mustard include/linux/input.h | 5 +++++ include/linux/sysrq.h | 8 +++++++- kernel/debug/kdb/kdb_main.c | 2 +- - kernel/module.c | 4 ++-- - 7 files changed, 65 insertions(+), 10 deletions(-) + kernel/module.c | 2 +- + 7 files changed, 64 insertions(+), 9 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 9bcd51050511..0290275eaaf8 100644 +index 5def6b4143fa..1eac9d22cb0b 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -70,6 +70,11 @@ @@ -30,7 +30,7 @@ index 9bcd51050511..0290275eaaf8 100644 #include <video/edid.h> #include <asm/mtrr.h> -@@ -1287,6 +1292,37 @@ void __init i386_reserve_resources(void) +@@ -1286,6 +1291,37 @@ void __init i386_reserve_resources(void) #endif /* CONFIG_X86_32 */ @@ -81,7 +81,7 @@ index 421e29e4cd81..61c1eb97806c 100644 input_set_drvdata(udev->dev, udev); diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c -index 2847108cc8dd..e8225c68dbc5 100644 +index b5b427888b24..289c7898a3b0 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -465,6 +465,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = { @@ -228,18 +228,15 @@ index 4121345498e0..0ff3cef5df96 100644 return 0; diff --git a/kernel/module.c b/kernel/module.c -index 4c682ab7e640..9be8d9c03c90 100644 +index ad221aaf1400..197ccb766f8a 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -107,9 +107,9 @@ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */ - - #ifdef CONFIG_MODULE_SIG - #ifdef CONFIG_MODULE_SIG_FORCE --static bool sig_enforce = true; -+bool sig_enforce = true; - #else --static bool sig_enforce = false; -+bool sig_enforce = false; - - static int param_set_bool_enable_only(const char *val, - const struct kernel_param *kp) +@@ -292,7 +292,7 @@ static void module_assert_mutex_or_preempt(void) + #endif + } + +-static bool sig_enforce = IS_ENABLED(CONFIG_MODULE_SIG_FORCE); ++bool sig_enforce = IS_ENABLED(CONFIG_MODULE_SIG_FORCE); + #ifndef CONFIG_MODULE_SIG_FORCE + module_param(sig_enforce, bool_enable_only, 0644); + #endif /* !CONFIG_MODULE_SIG_FORCE */ |