diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 14:02:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 14:02:56 -0800 |
| commit | c688f14ccd4266289fd51e76210c13fdf67f1d9d (patch) | |
| tree | 3bcf79ff8da8e83e7986c3db275261deb20bf10a /arch | |
| parent | 9e91c144e689bb780b412c2c7908b9cf7b96f31f (diff) | |
| parent | 5c51f4ae84df0f9df33ac08aa5be50061a8b4242 (diff) | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Ingo Molnar:
"A couple of sched.h splitup related build fixes, plus an objtool fix"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
objtool: Fix another GCC jump table detection issue
drivers/char/nwbutton: Fix build breakage caused by include file reshuffling
h8300: Fix build breakage caused by header file changes
avr32: Fix build error caused by include file reshuffling
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/avr32/oprofile/backtrace.c | 2 | ||||
| -rw-r--r-- | arch/h8300/kernel/ptrace_h.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/avr32/oprofile/backtrace.c b/arch/avr32/oprofile/backtrace.c index 75d9ad6f99cf..29cf2f191bfd 100644 --- a/arch/avr32/oprofile/backtrace.c +++ b/arch/avr32/oprofile/backtrace.c @@ -14,7 +14,7 @@ */ #include <linux/oprofile.h> -#include <linux/sched.h> +#include <linux/ptrace.h> #include <linux/uaccess.h> /* The first two words of each frame on the stack look like this if we have diff --git a/arch/h8300/kernel/ptrace_h.c b/arch/h8300/kernel/ptrace_h.c index fe3b5673baba..f5ff3b794c85 100644 --- a/arch/h8300/kernel/ptrace_h.c +++ b/arch/h8300/kernel/ptrace_h.c @@ -9,7 +9,7 @@ */ #include <linux/linkage.h> -#include <linux/sched.h> +#include <linux/sched/signal.h> #include <asm/ptrace.h> #define BREAKINST 0x5730 /* trapa #3 */ |