Merge commit 'perf/core' into perf/hw-breakpoint

Conflicts:
	kernel/Makefile
	kernel/trace/Makefile
	kernel/trace/trace.h
	samples/Makefile

Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.

diff --cc arch/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/processor.h
index 1153037,c3429e8..61aafb7
--- 1/arch/x86/include/asm/processor.h
--- 2/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@@ -27,9 -27,9 +27,10 @@@ struct mm_struct
  #include <linux/cpumask.h>
  #include <linux/cache.h>
  #include <linux/threads.h>
+ #include <linux/math64.h>
  #include <linux/init.h>
  
 +#define HBP_NUM 4
  /*
   * Default implementation of macro that returns current
   * instruction pointer ("program counter").

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/process.c
Simple merge

diff --cc arch/x86/kernel/ptrace.c
Simple merge

diff --cc arch/x86/kernel/signal.c
Simple merge

diff --cc arch/x86/kernel/smpboot.c
index ec7b64c,565ebc6..213a7a3
--- 1/arch/x86/kernel/smpboot.c
--- 2/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@@ -324,10 -324,9 +325,10 @@@ notrace static void __cpuinit start_sec
        /* enable local interrupts */
        local_irq_enable();
  
-       setup_secondary_clock();
+       x86_cpuinit.setup_percpu_clockev();
  
        wmb();
 +      load_debug_registers();
        cpu_idle();
  }
  

diff --cc arch/x86/kernel/traps.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc arch/x86/power/cpu.c
Simple merge

diff --cc kernel/Makefile
index 69943fd,b8d4cd8..17b575e
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -97,8 -94,7 +94,8 @@@ obj-$(CONFIG_X86_DS) += trace
  obj-$(CONFIG_RING_BUFFER) += trace/
  obj-$(CONFIG_SMP) += sched_cpupri.o
  obj-$(CONFIG_SLOW_WORK) += slow-work.o
- obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o
+ obj-$(CONFIG_PERF_EVENTS) += perf_event.o
 +obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
  
  ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
  # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is

diff --cc kernel/trace/Kconfig
Simple merge

diff --cc kernel/trace/Makefile
index ce3b1cd,26f03ac..0f84c52
--- 1/kernel/trace/Makefile
--- 2/kernel/trace/Makefile
+++ b/kernel/trace/Makefile
@@@ -54,6 -53,6 +53,7 @@@ obj-$(CONFIG_EVENT_TRACING) += trace_ex
  obj-$(CONFIG_FTRACE_SYSCALLS) += trace_syscalls.o
  obj-$(CONFIG_EVENT_PROFILE) += trace_event_profile.o
  obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
 +obj-$(CONFIG_KSYM_TRACER) += trace_ksym.o
+ obj-$(CONFIG_EVENT_TRACING) += power-traces.o
  
  libftrace-y := ftrace.o

diff --cc kernel/trace/trace.h
index ea7e0bc,4959ada..91c3d0e
--- 1/kernel/trace/trace.h
--- 2/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@@ -40,9 -36,7 +40,8 @@@ enum trace_type 
        TRACE_HW_BRANCHES,
        TRACE_KMEM_ALLOC,
        TRACE_KMEM_FREE,
-       TRACE_POWER,
        TRACE_BLK,
 +      TRACE_KSYM,
  
        __TRACE_LAST_TYPE,
  };
@@@ -485,7 -362,8 +368,11 @@@ void tracing_stop_sched_switch_record(v
  void tracing_start_sched_switch_record(void);
  int register_tracer(struct tracer *type);
  void unregister_tracer(struct tracer *type);
+ int is_tracing_stopped(void);
+ 
++#define KSYM_SELFTEST_ENTRY "ksym_selftest_dummy"
++extern int process_new_ksym_entry(char *ksymname, int op, unsigned long addr);
 +
  extern unsigned long nsecs_to_usecs(unsigned long nsecs);
  
  #ifdef CONFIG_TRACER_MAX_TRACE

diff --cc kernel/trace/trace_entries.h
index 0000000,ead3d72..e19747d
mode 000000,100644..100644
--- /dev/null
--- 2/kernel/trace/trace_entries.h
+++ b/kernel/trace/trace_entries.h
@@@ -1,0 -1,366 +1,382 @@@
+ /*
+  * This file defines the trace event structures that go into the ring
+  * buffer directly. They are created via macros so that changes for them
+  * appear in the format file. Using macros will automate this process.
+  *
+  * The macro used to create a ftrace data structure is:
+  *
+  * FTRACE_ENTRY( name, struct_name, id, structure, print )
+  *
+  * @name: the name used the event name, as well as the name of
+  *   the directory that holds the format file.
+  *
+  * @struct_name: the name of the structure that is created.
+  *
+  * @id: The event identifier that is used to detect what event
+  *    this is from the ring buffer.
+  *
+  * @structure: the structure layout
+  *
+  *  - __field(        type,   item    )
+  *      This is equivalent to declaring
+  *            type    item;
+  *      in the structure.
+  *  - __array(        type,   item,   size    )
+  *      This is equivalent to declaring
+  *            type    item[size];
+  *      in the structure.
+  *
+  *   * for structures within structures, the format of the internal
+  *    structure is layed out. This allows the internal structure
+  *    to be deciphered for the format file. Although these macros
+  *    may become out of sync with the internal structure, they
+  *    will create a compile error if it happens. Since the
+  *    internel structures are just tracing helpers, this is not
+  *    an issue.
+  *
+  *    When an internal structure is used, it should use:
+  *
+  *    __field_struct( type,   item    )
+  *
+  *    instead of __field. This will prevent it from being shown in
+  *    the output file. The fields in the structure should use.
+  *
+  *    __field_desc(   type,   container,      item            )
+  *    __array_desc(   type,   container,      item,   len     )
+  *
+  *    type, item and len are the same as __field and __array, but
+  *    container is added. This is the name of the item in
+  *    __field_struct that this is describing.
+  *
+  *
+  * @print: the print format shown to users in the format file.
+  */
+ 
+ /*
+  * Function trace entry - function address and parent function addres:
+  */
+ FTRACE_ENTRY(function, ftrace_entry,
+ 
+       TRACE_FN,
+ 
+       F_STRUCT(
+               __field(        unsigned long,  ip              )
+               __field(        unsigned long,  parent_ip       )
+       ),
+ 
+       F_printk(" %lx <-- %lx", __entry->ip, __entry->parent_ip)
+ );
+ 
+ /* Function call entry */
+ FTRACE_ENTRY(funcgraph_entry, ftrace_graph_ent_entry,
+ 
+       TRACE_GRAPH_ENT,
+ 
+       F_STRUCT(
+               __field_struct( struct ftrace_graph_ent,        graph_ent       )
+               __field_desc(   unsigned long,  graph_ent,      func            )
+               __field_desc(   int,            graph_ent,      depth           )
+       ),
+ 
+       F_printk("--> %lx (%d)", __entry->func, __entry->depth)
+ );
+ 
+ /* Function return entry */
+ FTRACE_ENTRY(funcgraph_exit, ftrace_graph_ret_entry,
+ 
+       TRACE_GRAPH_RET,
+ 
+       F_STRUCT(
+               __field_struct( struct ftrace_graph_ret,        ret     )
+               __field_desc(   unsigned long,  ret,            func    )
+               __field_desc(   unsigned long long, ret,        calltime)
+               __field_desc(   unsigned long long, ret,        rettime )
+               __field_desc(   unsigned long,  ret,            overrun )
+               __field_desc(   int,            ret,            depth   )
+       ),
+ 
+       F_printk("<-- %lx (%d) (start: %llx  end: %llx) over: %d",
+                __entry->func, __entry->depth,
+                __entry->calltime, __entry->rettime,
+                __entry->depth)
+ );
+ 
+ /*
+  * Context switch trace entry - which task (and prio) we switched from/to:
+  *
+  * This is used for both wakeup and context switches. We only want
+  * to create one structure, but we need two outputs for it.
+  */
+ #define FTRACE_CTX_FIELDS                                     \
+       __field(        unsigned int,   prev_pid        )       \
+       __field(        unsigned char,  prev_prio       )       \
+       __field(        unsigned char,  prev_state      )       \
+       __field(        unsigned int,   next_pid        )       \
+       __field(        unsigned char,  next_prio       )       \
+       __field(        unsigned char,  next_state      )       \
+       __field(        unsigned int,   next_cpu        )
+ 
+ FTRACE_ENTRY(context_switch, ctx_switch_entry,
+ 
+       TRACE_CTX,
+ 
+       F_STRUCT(
+               FTRACE_CTX_FIELDS
+       ),
+ 
+       F_printk("%u:%u:%u  ==> %u:%u:%u [%03u]",
+                __entry->prev_pid, __entry->prev_prio, __entry->prev_state,
+                __entry->next_pid, __entry->next_prio, __entry->next_state,
+                __entry->next_cpu
+               )
+ );
+ 
+ /*
+  * FTRACE_ENTRY_DUP only creates the format file, it will not
+  *  create another structure.
+  */
+ FTRACE_ENTRY_DUP(wakeup, ctx_switch_entry,
+ 
+       TRACE_WAKE,
+ 
+       F_STRUCT(
+               FTRACE_CTX_FIELDS
+       ),
+ 
+       F_printk("%u:%u:%u  ==+ %u:%u:%u [%03u]",
+                __entry->prev_pid, __entry->prev_prio, __entry->prev_state,
+                __entry->next_pid, __entry->next_prio, __entry->next_state,
+                __entry->next_cpu
+               )
+ );
+ 
+ /*
+  * Special (free-form) trace entry:
+  */
+ FTRACE_ENTRY(special, special_entry,
+ 
+       TRACE_SPECIAL,
+ 
+       F_STRUCT(
+               __field(        unsigned long,  arg1    )
+               __field(        unsigned long,  arg2    )
+               __field(        unsigned long,  arg3    )
+       ),
+ 
+       F_printk("(%08lx) (%08lx) (%08lx)",
+                __entry->arg1, __entry->arg2, __entry->arg3)
+ );
+ 
+ /*
+  * Stack-trace entry:
+  */
+ 
+ #define FTRACE_STACK_ENTRIES  8
+ 
+ FTRACE_ENTRY(kernel_stack, stack_entry,
+ 
+       TRACE_STACK,
+ 
+       F_STRUCT(
+               __array(        unsigned long,  caller, FTRACE_STACK_ENTRIES    )
+       ),
+ 
+       F_printk("\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n"
+                "\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n",
+                __entry->caller[0], __entry->caller[1], __entry->caller[2],
+                __entry->caller[3], __entry->caller[4], __entry->caller[5],
+                __entry->caller[6], __entry->caller[7])
+ );
+ 
+ FTRACE_ENTRY(user_stack, userstack_entry,
+ 
+       TRACE_USER_STACK,
+ 
+       F_STRUCT(
+               __field(        unsigned int,   tgid    )
+               __array(        unsigned long,  caller, FTRACE_STACK_ENTRIES    )
+       ),
+ 
+       F_printk("\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n"
+                "\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n",
+                __entry->caller[0], __entry->caller[1], __entry->caller[2],
+                __entry->caller[3], __entry->caller[4], __entry->caller[5],
+                __entry->caller[6], __entry->caller[7])
+ );
+ 
+ /*
+  * trace_printk entry:
+  */
+ FTRACE_ENTRY(bprint, bprint_entry,
+ 
+       TRACE_BPRINT,
+ 
+       F_STRUCT(
+               __field(        unsigned long,  ip      )
+               __field(        const char *,   fmt     )
+               __dynamic_array(        u32,    buf     )
+       ),
+ 
+       F_printk("%08lx fmt:%p",
+                __entry->ip, __entry->fmt)
+ );
+ 
+ FTRACE_ENTRY(print, print_entry,
+ 
+       TRACE_PRINT,
+ 
+       F_STRUCT(
+               __field(        unsigned long,  ip      )
+               __dynamic_array(        char,   buf     )
+       ),
+ 
+       F_printk("%08lx %s",
+                __entry->ip, __entry->buf)
+ );
+ 
+ FTRACE_ENTRY(mmiotrace_rw, trace_mmiotrace_rw,
+ 
+       TRACE_MMIO_RW,
+ 
+       F_STRUCT(
+               __field_struct( struct mmiotrace_rw,    rw      )
+               __field_desc(   resource_size_t, rw,    phys    )
+               __field_desc(   unsigned long,  rw,     value   )
+               __field_desc(   unsigned long,  rw,     pc      )
+               __field_desc(   int,            rw,     map_id  )
+               __field_desc(   unsigned char,  rw,     opcode  )
+               __field_desc(   unsigned char,  rw,     width   )
+       ),
+ 
+       F_printk("%lx %lx %lx %d %x %x",
+                (unsigned long)__entry->phys, __entry->value, __entry->pc,
+                __entry->map_id, __entry->opcode, __entry->width)
+ );
+ 
+ FTRACE_ENTRY(mmiotrace_map, trace_mmiotrace_map,
+ 
+       TRACE_MMIO_MAP,
+ 
+       F_STRUCT(
+               __field_struct( struct mmiotrace_map,   map     )
+               __field_desc(   resource_size_t, map,   phys    )
+               __field_desc(   unsigned long,  map,    virt    )
+               __field_desc(   unsigned long,  map,    len     )
+               __field_desc(   int,            map,    map_id  )
+               __field_desc(   unsigned char,  map,    opcode  )
+       ),
+ 
+       F_printk("%lx %lx %lx %d %x",
+                (unsigned long)__entry->phys, __entry->virt, __entry->len,
+                __entry->map_id, __entry->opcode)
+ );
+ 
+ FTRACE_ENTRY(boot_call, trace_boot_call,
+ 
+       TRACE_BOOT_CALL,
+ 
+       F_STRUCT(
+               __field_struct( struct boot_trace_call, boot_call       )
+               __field_desc(   pid_t,  boot_call,      caller          )
+               __array_desc(   char,   boot_call,      func,   KSYM_SYMBOL_LEN)
+       ),
+ 
+       F_printk("%d  %s", __entry->caller, __entry->func)
+ );
+ 
+ FTRACE_ENTRY(boot_ret, trace_boot_ret,
+ 
+       TRACE_BOOT_RET,
+ 
+       F_STRUCT(
+               __field_struct( struct boot_trace_ret,  boot_ret        )
+               __array_desc(   char,   boot_ret,       func,   KSYM_SYMBOL_LEN)
+               __field_desc(   int,    boot_ret,       result          )
+               __field_desc(   unsigned long, boot_ret, duration       )
+       ),
+ 
+       F_printk("%s %d %lx",
+                __entry->func, __entry->result, __entry->duration)
+ );
+ 
+ #define TRACE_FUNC_SIZE 30
+ #define TRACE_FILE_SIZE 20
+ 
+ FTRACE_ENTRY(branch, trace_branch,
+ 
+       TRACE_BRANCH,
+ 
+       F_STRUCT(
+               __field(        unsigned int,   line                            )
+               __array(        char,           func,   TRACE_FUNC_SIZE+1       )
+               __array(        char,           file,   TRACE_FILE_SIZE+1       )
+               __field(        char,           correct                         )
+       ),
+ 
+       F_printk("%u:%s:%s (%u)",
+                __entry->line,
+                __entry->func, __entry->file, __entry->correct)
+ );
+ 
+ FTRACE_ENTRY(hw_branch, hw_branch_entry,
+ 
+       TRACE_HW_BRANCHES,
+ 
+       F_STRUCT(
+               __field(        u64,    from    )
+               __field(        u64,    to      )
+       ),
+ 
+       F_printk("from: %llx to: %llx", __entry->from, __entry->to)
+ );
+ 
+ FTRACE_ENTRY(kmem_alloc, kmemtrace_alloc_entry,
+ 
+       TRACE_KMEM_ALLOC,
+ 
+       F_STRUCT(
+               __field(        enum kmemtrace_type_id, type_id         )
+               __field(        unsigned long,          call_site       )
+               __field(        const void *,           ptr             )
+               __field(        size_t,                 bytes_req       )
+               __field(        size_t,                 bytes_alloc     )
+               __field(        gfp_t,                  gfp_flags       )
+               __field(        int,                    node            )
+       ),
+ 
+       F_printk("type:%u call_site:%lx ptr:%p req:%zi alloc:%zi"
+                " flags:%x node:%d",
+                __entry->type_id, __entry->call_site, __entry->ptr,
+                __entry->bytes_req, __entry->bytes_alloc,
+                __entry->gfp_flags, __entry->node)
+ );
+ 
+ FTRACE_ENTRY(kmem_free, kmemtrace_free_entry,
+ 
+       TRACE_KMEM_FREE,
+ 
+       F_STRUCT(
+               __field(        enum kmemtrace_type_id, type_id         )
+               __field(        unsigned long,          call_site       )
+               __field(        const void *,           ptr             )
+       ),
+ 
+       F_printk("type:%u call_site:%lx ptr:%p",
+                __entry->type_id, __entry->call_site, __entry->ptr)
+ );
++
++FTRACE_ENTRY(ksym_trace, ksym_trace_entry,
++
++      TRACE_KSYM,
++
++      F_STRUCT(
++              __field(        unsigned long,  ip                        )
++              __field(        unsigned char,  type                      )
++              __array(        char         ,  ksym_name, KSYM_NAME_LEN  )
++              __array(        char         ,  cmd,       TASK_COMM_LEN  )
++      ),
++
++      F_printk("ip: %pF type: %d ksym_name: %s cmd: %s",
++              (void *)__entry->ip, (unsigned int)__entry->type,
++              __entry->ksym_name, __entry->cmd)
++);

diff --cc samples/Kconfig
Simple merge

diff --cc samples/Makefile
index 42e1755,43343a0..0f15e6d
--- 1/samples/Makefile
--- 2/samples/Makefile
+++ b/samples/Makefile
@@@ -1,4 -1,3 +1,4 @@@
  # Makefile for Linux samples code
  
- obj-$(CONFIG_SAMPLES) += markers/ kobject/ kprobes/ tracepoints/ \
-                       trace_events/ hw_breakpoint/
 -obj-$(CONFIG_SAMPLES) += kobject/ kprobes/ tracepoints/ trace_events/
++obj-$(CONFIG_SAMPLES) += kobject/ kprobes/ tracepoints/ trace_events/ \
++                         hw_breakpoint/