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

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

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc include/linux/ftrace.h
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc kernel/trace/Kconfig
Simple merge

diff --cc kernel/trace/blktrace.c
Simple merge

diff --cc kernel/trace/ftrace.c
index b3fde6d7b7fc47683244a5a432ab35a543551499,9b44abb2c5a0bf585ff73de22c07031af35b76da..8a5c017bb50c141bfca4d8206ac2a1805d224185
--- 1/kernel/trace/ftrace.c
--- 2/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@@ -761,9 -755,10 +754,9 @@@ ftrace_find_profiled_func(struct ftrace
  {
        struct ftrace_profile *rec;
        struct hlist_head *hhd;
 -      struct hlist_node *n;
        unsigned long key;
  
-       key = hash_long(ip, ftrace_profile_bits);
+       key = hash_long(ip, FTRACE_PROFILE_HASH_BITS);
        hhd = &stat->hash[key];
  
        if (hlist_empty(hhd))
@@@ -1371,11 -1354,7 +1363,7 @@@ ftrace_hash_move(struct ftrace_ops *ops
        size = 1 << src->size_bits;
        for (i = 0; i < size; i++) {
                hhd = &src->buckets[i];
 -              hlist_for_each_entry_safe(entry, tp, tn, hhd, hlist) {
 +              hlist_for_each_entry_safe(entry, tn, hhd, hlist) {
-                       if (bits > 0)
-                               key = hash_long(entry->ip, bits);
-                       else
-                               key = 0;
                        remove_hash_entry(src, entry);
                        __add_hash_entry(new_hash, entry);
                }
@@@ -3062,8 -3075,13 +3070,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 hlist_node *n, *tmp;
+       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 *tmp;
        char str[KSYM_SYMBOL_LEN];
        int type = MATCH_FULL;
        int i, len = 0;

diff --cc kernel/trace/ring_buffer.c
Simple merge

diff --cc kernel/trace/trace.c
index 66338c4f7f4bdb6142c2b21a99f14292c708d050,72970793b40a09b2e44539dae8c80f51a8b7fa20..ae6fa2d1cdf7dd75dd7e9aa4cfb66bcb32192315
--- 1/kernel/trace/trace.c
--- 2/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@@ -744,11 -904,8 +904,11 @@@ update_max_tr_single(struct trace_arra
                return;
  
        WARN_ON_ONCE(!irqs_disabled());
-       if (!current_trace->allocated_snapshot) {
 -      if (WARN_ON_ONCE(!tr->allocated_snapshot))
++      if (!tr->allocated_snapshot) {
 +              /* Only the nop tracer should hit this when disabling */
-               WARN_ON_ONCE(current_trace != &nop_trace);
++              WARN_ON_ONCE(tr->current_trace != &nop_trace);
                return;
 +      }
  
        arch_spin_lock(&ftrace_max_lock);
  

diff --cc kernel/trace/trace.h
Simple merge

diff --cc kernel/trace/trace_output.c
Simple merge

diff --cc kernel/trace/trace_stack.c
Simple merge