---

yaml --- r: 245537 b: refs/heads/master c: b848914 h: refs/heads/master i: 245535: 3ee8572 v: v3
git-mirror · May 18, 2011 · 6be2160 · 6be2160
1 parent 7aebd5b
commit 6be2160
Show file tree

Hide file tree

Showing 7 changed files with 167 additions and 40 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07fd5515f3b5c20704707f63e7f4485b534508a8
+refs/heads/master: b848914ce39589d89ee0078a6d1ef452b464729e
diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h
@@ -31,13 +31,18 @@ typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip);
 
 struct ftrace_hash;
 
+enum {
+	FTRACE_OPS_FL_ENABLED		= 1 << 0,
+	FTRACE_OPS_FL_GLOBAL		= 1 << 1,
+};
+
 struct ftrace_ops {
 	ftrace_func_t			func;
 	struct ftrace_ops		*next;
+	unsigned long			flags;
 #ifdef CONFIG_DYNAMIC_FTRACE
 	struct ftrace_hash		*notrace_hash;
 	struct ftrace_hash		*filter_hash;
-	unsigned long			flags;
 #endif
 };