From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 4 Apr 2013 03:13:29 +0000 (+1100)
Subject: Merge remote-tracking branch 'ftrace/for-next'
X-Git-Tag: next-20130404~40
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c6289830411a432d4167890a1b9d55432191ff4c;p=karo-tx-linux.git

Merge remote-tracking branch 'ftrace/for-next'

Conflicts:
	kernel/trace/ftrace.c
---

c6289830411a432d4167890a1b9d55432191ff4c
diff --cc kernel/trace/ftrace.c
index 6893d5a2bf08,25770824598f..dfd33f0172a1
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@@ -3063,8 -3087,13 +3083,13 @@@ static voi
  __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
  				  void *data, int flags)
  {
+ 	struct ftrace_func_entry *rec_entry;
  	struct ftrace_func_probe *entry;
+ 	struct ftrace_func_probe *p;
+ 	struct ftrace_hash **orig_hash = &trace_probe_ops.filter_hash;
+ 	struct list_head free_list;
+ 	struct ftrace_hash *hash;
 -	struct hlist_node *n, *tmp;
 +	struct hlist_node *tmp;
  	char str[KSYM_SYMBOL_LEN];
  	int type = MATCH_FULL;
  	int i, len = 0;