diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-29 13:09:45 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-29 13:09:45 +1100 |
| commit | a8414409387eeca841734aacf9180ac918341117 (patch) | |
| tree | 0e39019a04f641e279fc46aa59262ce59d584f6d /arch/x86/kernel/process.c | |
| parent | 49f2b891ee88735f9a00ddd7a4e4abc9626af212 (diff) | |
| parent | fd20b0c7a2bf635fa4ec2f99ee85f0bf59612485 (diff) | |
| download | linux-next-a8414409387eeca841734aacf9180ac918341117.tar.gz | |
Merge remote-tracking branch 'tip/auto-latest'
Diffstat (limited to 'arch/x86/kernel/process.c')
| -rw-r--r-- | arch/x86/kernel/process.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index c93fcfdf1673..b7cb5348f37f 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -22,6 +22,8 @@ #include <linux/utsname.h> #include <linux/stackprotector.h> #include <linux/cpuidle.h> +#include <linux/acpi.h> +#include <linux/elf-randomize.h> #include <trace/events/power.h> #include <linux/hw_breakpoint.h> #include <asm/cpu.h> @@ -39,6 +41,7 @@ #include <asm/desc.h> #include <asm/prctl.h> #include <asm/spec-ctrl.h> +#include <asm/proto.h> /* * per-CPU TSS segments. Threads are completely 'soft' on Linux, @@ -730,7 +733,7 @@ unsigned long get_wchan(struct task_struct *p) unsigned long start, bottom, top, sp, fp, ip, ret = 0; int count = 0; - if (!p || p == current || p->state == TASK_RUNNING) + if (p == current || p->state == TASK_RUNNING) return 0; if (!try_get_task_stack(p)) |