diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-01-07 14:10:18 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-01-07 14:10:18 -0800 |
| commit | 72142fd4109105c6bd21658966ca5e93c1684081 (patch) | |
| tree | e88f06da41eb6a23c606af5b57f268bc4894fdf2 | |
| parent | 47db9e7c808a45b1f86971f25eca5e38fa95ab86 (diff) | |
| download | linux-72142fd4109105c6bd21658966ca5e93c1684081.tar.bz2 | |
x86: Move <asm/asm-offsets.h> from trace_syscalls.c to asm/syscall.h
This reverts commit d5e553d6e0a4bdea43adae7373e3fa144b9a1aaa, which
caused large numbers of build warnings on PowerPC.
This moves the #include <asm/asm-offsets.h> to <asm/syscall.h>, which
makes some kind of sense since NR_syscalls is syscalls related.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Link: http://lkml.kernel.org/r/20111214181545.6e13bc954cb7ddce9086e861@canb.auug.org.au
| -rw-r--r-- | arch/x86/include/asm/syscall.h | 1 | ||||
| -rw-r--r-- | kernel/trace/trace_syscalls.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h index c4a348f7bd43..d962e5652a73 100644 --- a/arch/x86/include/asm/syscall.h +++ b/arch/x86/include/asm/syscall.h @@ -15,6 +15,7 @@ #include <linux/sched.h> #include <linux/err.h> +#include <asm/asm-offsets.h> /* For NR_syscalls */ extern const unsigned long sys_call_table[]; diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index 5f35f6f15d99..cb654542c1a1 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c @@ -6,7 +6,6 @@ #include <linux/ftrace.h> #include <linux/perf_event.h> #include <asm/syscall.h> -#include <asm/asm-offsets.h> #include "trace_output.h" #include "trace.h" |