Commit-ID: 72142fd4109105c6bd21658966ca5e93c1684081 Gitweb: http://git.kernel.org/tip/72142fd4109105c6bd21658966ca5e93c1684081 Author: H. Peter Anvin <hpa@xxxxxxxxx> AuthorDate: Sat, 7 Jan 2012 14:10:18 -0800 Committer: H. Peter Anvin <hpa@xxxxxxxxx> CommitDate: Sat, 7 Jan 2012 14:10:18 -0800 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@xxxxxxxxxxxxxxxx> Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx> Link: http://lkml.kernel.org/r/20111214181545.6e13bc954cb7ddce9086e861@xxxxxxxxxxxxxxxx --- arch/x86/include/asm/syscall.h | 1 + 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 c4a348f..d962e56 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 5f35f6f..cb65454 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" -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|