[PATCH 2/2] tracing, syscalltrace: Move include/trace/syscall.h to include/linux/syscalltrace.h

[Zhaolei <zhaolei@cn.fujitsu.com>]

Impact: refactor code, no functionality changed

Files in include/trace/ should be definition of tracepoints, and header
file for syscall trace should put to include/linux/.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
---
 arch/x86/kernel/ftrace.c                          |    3 +--
 arch/x86/kernel/ptrace.c                          |    3 +--
 include/linux/syscalls.h                          |    2 +-
 include/{trace/syscall.h => linux/syscalltrace.h} |    0 
 kernel/trace/trace_syscalls.c                     |    2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename include/{trace/syscall.h => linux/syscalltrace.h} (100%)

diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 18dfa30..63ab16e 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -17,8 +17,7 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/list.h>
-
-#include <trace/syscall.h>
+#include <linux/syscalltrace.h>
 
 #include <asm/cacheflush.h>
 #include <asm/ftrace.h>
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index d5252ae..25428a9 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -22,6 +22,7 @@
 #include <linux/seccomp.h>
 #include <linux/signal.h>
 #include <linux/workqueue.h>
+#include <linux/syscalltrace.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
@@ -35,8 +36,6 @@
 #include <asm/proto.h>
 #include <asm/ds.h>
 
-#include <trace/syscall.h>
-
 #include "tls.h"
 
 enum x86_regset {
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 35bbf67..3c207e9 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -66,7 +66,7 @@ struct perf_counter_hw_event;
 #include <asm/signal.h>
 #include <linux/quota.h>
 #include <linux/key.h>
-#include <trace/syscall.h>
+#include <linux/syscalltrace.h>
 
 #define __SC_DECL1(t1, a1)	t1 a1
 #define __SC_DECL2(t2, a2, ...) t2 a2, __SC_DECL1(__VA_ARGS__)
diff --git a/include/trace/syscall.h b/include/linux/syscalltrace.h
similarity index 100%
rename from include/trace/syscall.h
rename to include/linux/syscalltrace.h
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 5e57964..ab00bc5 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -1,4 +1,4 @@
-#include <trace/syscall.h>
+#include <linux/syscalltrace.h>
 #include <linux/kernel.h>
 #include <asm/syscall.h>
 
-- 
1.5.5.3