From ee5e08a56c67d3cecf83f00d3cbae383bb7b50e9 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Sat, 7 Jan 2012 14:10:18 -0800
Subject: [PATCH] --- yaml --- r: 285922 b: refs/heads/master c:
 72142fd4109105c6bd21658966ca5e93c1684081 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/include/asm/syscall.h | 1 +
 trunk/kernel/trace/trace_syscalls.c  | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 97756ba2572a..f26746bb0753 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47db9e7c808a45b1f86971f25eca5e38fa95ab86
+refs/heads/master: 72142fd4109105c6bd21658966ca5e93c1684081
diff --git a/trunk/arch/x86/include/asm/syscall.h b/trunk/arch/x86/include/asm/syscall.h
index c4a348f7bd43..d962e5652a73 100644
--- a/trunk/arch/x86/include/asm/syscall.h
+++ b/trunk/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/trunk/kernel/trace/trace_syscalls.c b/trunk/kernel/trace/trace_syscalls.c
index 5f35f6f15d99..cb654542c1a1 100644
--- a/trunk/kernel/trace/trace_syscalls.c
+++ b/trunk/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"