diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2017-03-17 20:34:30 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-03-17 20:34:30 +0100 |
commit | 79a21d572cf66968a2272fdf9711f835518256d9 (patch) | |
tree | 5fe3e4692fb8375faf8e1aeea1c2eae38c342250 /arch/um/kernel/sysrq.c | |
parent | d1eb98143c56f24fef125f5bbed49ae0b52fb7d6 (diff) | |
parent | 822f5845f710e57d7e2df1fd1ee00d6e19d334fe (diff) | |
download | talos-op-linux-79a21d572cf66968a2272fdf9711f835518256d9.tar.gz talos-op-linux-79a21d572cf66968a2272fdf9711f835518256d9.zip |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent
Pull a single UEFI fix from Ard:
- Reduce the severity of the notice that appears when the ESRT table points
to memory that is not covered by the memory map. It is scaring our users
and interfering with their nice splash screens. Note that the ESRT may still
be perfectly usable, and is currently (to my knowledge) not widely used to
begin with.
Diffstat (limited to 'arch/um/kernel/sysrq.c')
-rw-r--r-- | arch/um/kernel/sysrq.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c index aa1b56f5ac68..a76295f7ede9 100644 --- a/arch/um/kernel/sysrq.c +++ b/arch/um/kernel/sysrq.c @@ -11,6 +11,9 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/sched.h> +#include <linux/sched/debug.h> +#include <linux/sched/task_stack.h> + #include <asm/sysrq.h> #include <asm/stacktrace.h> #include <os.h> |