---

yaml --- r: 121260 b: refs/heads/master c: 1fd8f2a h: refs/heads/master v: v3
git-mirror · Dec 4, 2008 · 2954edd · 2954edd
1 parent f909b55
commit 2954edd
Show file tree

Hide file tree

Showing 9 changed files with 114 additions and 448 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: faec2ec505d397e9426754722b6e80d519c4938f
+refs/heads/master: 1fd8f2a3f9a91b287a876cef830b21baafc8a799
diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h
@@ -7,7 +7,6 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/kallsyms.h>
-#include <linux/bitops.h>
 
 #ifdef CONFIG_FUNCTION_TRACER
 
@@ -392,49 +391,4 @@ static inline void ftrace_graph_init_task(struct task_struct *t) { }
 static inline void ftrace_graph_exit_task(struct task_struct *t) { }
 #endif
 
-#ifdef CONFIG_TRACING
-#include <linux/sched.h>
-
-/* flags for current->trace */
-enum {
-	TSK_TRACE_FL_TRACE_BIT	= 0,
-	TSK_TRACE_FL_GRAPH_BIT	= 1,
-};
-enum {
-	TSK_TRACE_FL_TRACE	= 1 << TSK_TRACE_FL_TRACE_BIT,
-	TSK_TRACE_FL_GRAPH	= 1 << TSK_TRACE_FL_GRAPH_BIT,
-};
-
-static inline void set_tsk_trace_trace(struct task_struct *tsk)
-{
-	set_bit(TSK_TRACE_FL_TRACE_BIT, &tsk->trace);
-}
-
-static inline void clear_tsk_trace_trace(struct task_struct *tsk)
-{
-	clear_bit(TSK_TRACE_FL_TRACE_BIT, &tsk->trace);
-}
-
-static inline int test_tsk_trace_trace(struct task_struct *tsk)
-{
-	return tsk->trace & TSK_TRACE_FL_TRACE;
-}
-
-static inline void set_tsk_trace_graph(struct task_struct *tsk)
-{
-	set_bit(TSK_TRACE_FL_GRAPH_BIT, &tsk->trace);
-}
-
-static inline void clear_tsk_trace_graph(struct task_struct *tsk)
-{
-	clear_bit(TSK_TRACE_FL_GRAPH_BIT, &tsk->trace);
-}
-
-static inline int test_tsk_trace_graph(struct task_struct *tsk)
-{
-	return tsk->trace & TSK_TRACE_FL_GRAPH;
-}
-
-#endif /* CONFIG_TRACING */
-
 #endif /* _LINUX_FTRACE_H */
diff --git a/trunk/include/linux/pid.h b/trunk/include/linux/pid.h
@@ -147,9 +147,9 @@ pid_t pid_vnr(struct pid *pid);
 #define do_each_pid_task(pid, type, task)				\
 	do {								\
 		struct hlist_node *pos___;				\
-		if ((pid) != NULL)					\
+		if (pid != NULL)					\
 			hlist_for_each_entry_rcu((task), pos___,	\
-				&(pid)->tasks[type], pids[type].node) {
+				&pid->tasks[type], pids[type].node) {
 
 			/*
 			 * Both old and new leaders may be attached to

diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
@@ -1380,10 +1380,6 @@ struct task_struct {
 	 */
 	atomic_t trace_overrun;
 #endif
-#ifdef CONFIG_TRACING
-	/* state flags for use by tracers */
-	unsigned long trace;
-#endif
 };
 
 /*