Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (162 commits)
  tracing/kprobes: unregister_trace_probe needs to be called under mutex
  perf: expose event__process function
  perf events: Fix mmap offset determination
  perf, powerpc: fsl_emb: Restore setting perf_sample_data.period
  perf, powerpc: Convert the FSL driver to use local64_t
  perf tools: Don't keep unreferenced maps when unmaps are detected
  perf session: Invalidate last_match when removing threads from rb_tree
  perf session: Free the ref_reloc_sym memory at the right place
  x86,mmiotrace: Add support for tracing STOS instruction
  perf, sched migration: Librarize task states and event headers helpers
  perf, sched migration: Librarize the GUI class
  perf, sched migration: Make the GUI class client agnostic
  perf, sched migration: Make it vertically scrollable
  perf, sched migration: Parameterize cpu height and spacing
  perf, sched migration: Fix key bindings
  perf, sched migration: Ignore unhandled task states
  perf, sched migration: Handle ignored migrate out events
  perf: New migration tool overview
  tracing: Drop cpparg() macro
  perf: Use tracepoint_synchronize_unregister() to flush any pending tracepoint call
  ...

Fix up trivial conflicts in Makefile and drivers/cpufreq/cpufreq.c

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

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
index 66c94aa,85a14f5..7431c28
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -418,9 -412,9 +418,9 @@@ endi
  # of make so .config is not included in this case either (for *config).
  
  no-dot-config-targets := clean mrproper distclean \
 -                       cscope TAGS tags help %docs check% \
 +                       cscope TAGS tags help %docs check% coccicheck \
                         include/linux/version.h headers_% \
-                        kernelversion
 -                       kernelrelease kernelversion %src-pkg
++                       kernelversion %src-pkg
  
  config-targets := 0
  mixed-targets  := 0

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

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

diff --cc init/main.c
Simple merge

diff --cc kernel/hw_breakpoint.c
index 71ed3ce,e34d94d..d71a987
--- 1/kernel/hw_breakpoint.c
--- 2/kernel/hw_breakpoint.c
+++ b/kernel/hw_breakpoint.c
@@@ -222,36 -215,32 +215,43 @@@ toggle_bp_slot(struct perf_event *bp, b
        int cpu = bp->cpu;
        struct task_struct *tsk = bp->ctx->task;
  
+       /* Pinned counter cpu profiling */
+       if (!tsk) {
+ 
+               if (enable)
+                       per_cpu(nr_cpu_bp_pinned[type], bp->cpu) += weight;
+               else
+                       per_cpu(nr_cpu_bp_pinned[type], bp->cpu) -= weight;
+               return;
+       }
+ 
        /* Pinned counter task profiling */
-       if (tsk) {
-               if (cpu >= 0) {
-                       toggle_bp_task_slot(tsk, cpu, enable, type, weight);
-                       return;
-               }
  
+       if (!enable)
+               list_del(&bp->hw.bp_list);
+ 
+       if (cpu >= 0) {
+               toggle_bp_task_slot(bp, cpu, enable, type, weight);
+       } else {
                for_each_online_cpu(cpu)
-                       toggle_bp_task_slot(tsk, cpu, enable, type, weight);
-               return;
+                       toggle_bp_task_slot(bp, cpu, enable, type, weight);
        }
  
-       /* Pinned counter cpu profiling */
        if (enable)
-               per_cpu(nr_cpu_bp_pinned[type], bp->cpu) += weight;
-       else
-               per_cpu(nr_cpu_bp_pinned[type], bp->cpu) -= weight;
+               list_add_tail(&bp->hw.bp_list, &bp_task_head);
  }
  
 +/*
 + * Function to perform processor-specific cleanup during unregistration
 + */
 +__weak void arch_unregister_hw_breakpoint(struct perf_event *bp)
 +{
 +      /*
 +       * A weak stub function here for those archs that don't define
 +       * it inside arch/.../kernel/hw_breakpoint.c
 +       */
 +}
 +
  /*
   * Contraints to check before allowing this new breakpoint counter:
   *

diff --cc kernel/timer.c
Simple merge

diff --cc kernel/trace/Makefile
index 4215530,438e84a..53f3381
--- 1/kernel/trace/Makefile
--- 2/kernel/trace/Makefile
+++ b/kernel/trace/Makefile
@@@ -55,10 -52,6 +52,9 @@@ obj-$(CONFIG_EVENT_TRACING) += trace_ev
  endif
  obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
  obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
- obj-$(CONFIG_KSYM_TRACER) += trace_ksym.o
  obj-$(CONFIG_EVENT_TRACING) += power-traces.o
 +ifeq ($(CONFIG_TRACING),y)
 +obj-$(CONFIG_KGDB_KDB) += trace_kdb.o
 +endif
  
  libftrace-y := ftrace.o

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

diff --cc kernel/trace/trace.h
index 0605fc0,d05c873..d39b3c5
--- 1/kernel/trace/trace.h
--- 2/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@@ -388,18 -351,7 +359,16 @@@ void tracing_start_sched_switch_record(
  int register_tracer(struct tracer *type);
  void unregister_tracer(struct tracer *type);
  int is_tracing_stopped(void);
 +enum trace_file_type {
 +      TRACE_FILE_LAT_FMT      = 1,
 +      TRACE_FILE_ANNOTATE     = 2,
 +};
 +
 +extern cpumask_var_t __read_mostly tracing_buffer_mask;
 +
 +#define for_each_tracing_cpu(cpu)     \
 +      for_each_cpu(cpu, tracing_buffer_mask)
  
- extern int process_new_ksym_entry(char *ksymname, int op, unsigned long addr);
- 
  extern unsigned long nsecs_to_usecs(unsigned long nsecs);
  
  extern unsigned long tracing_thresh;

diff --cc lib/Kconfig.debug
Simple merge

diff --cc mm/slob.c
Simple merge