Commit 5d70f79b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-core-for-linus' of... 

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

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (163 commits)
  tracing: Fix compile issue for trace_sched_wakeup.c
  [S390] hardirq: remove pointless header file includes
  [IA64] Move local_softirq_pending() definition
  perf, powerpc: Fix power_pmu_event_init to not use event->ctx
  ftrace: Remove recursion between recordmcount and scripts/mod/empty
  jump_label: Add COND_STMT(), reducer wrappery
  perf: Optimize sw events
  perf: Use jump_labels to optimize the scheduler hooks
  jump_label: Add atomic_t interface
  jump_label: Use more consistent naming
  perf, hw_breakpoint: Fix crash in hw_breakpoint creation
  perf: Find task before event alloc
  perf: Fix task refcount bugs
  perf: Fix group moving
  irq_work: Add generic hardirq context callbacks
  perf_events: Fix transaction recovery in group_sched_in()
  perf_events: Fix bogus AMD64 generic TLB events
  perf_events: Fix bogus context time tracking
  tracing: Remove parent recording in latency tracer graph options
  tracing: Use one prologue for the preempt irqs off tracer function tracers
  ...
parents 888a6f77 750ed158

Documentation/kprobes.txt

+5 −3
Original line number Original line Diff line number Diff line
@@ -542,9 +542,11 @@ Kprobes does not use mutexes or allocate memory except during 
registration and unregistration.

registration and unregistration.





Probe handlers are run with preemption disabled.  Depending on the

Probe handlers are run with preemption disabled.  Depending on the

architecture, handlers may also run with interrupts disabled.  In any

architecture and optimization state, handlers may also run with

case, your handler should not yield the CPU (e.g., by attempting to

interrupts disabled (e.g., kretprobe handlers and optimized kprobe

acquire a semaphore).

handlers run without interrupt disabled on x86/x86-64).  In any case,

your handler should not yield the CPU (e.g., by attempting to acquire

a semaphore).





Since a return probe is implemented by replacing the return

Since a return probe is implemented by replacing the return

address with the trampoline's address, stack backtraces and calls

address with the trampoline's address, stack backtraces and calls

Makefile

+11 −0
Original line number Original line Diff line number Diff line
@@ -568,6 +568,12 @@ endif 




ifdef CONFIG_FUNCTION_TRACER

ifdef CONFIG_FUNCTION_TRACER

KBUILD_CFLAGS	+= -pg

KBUILD_CFLAGS	+= -pg

ifdef CONFIG_DYNAMIC_FTRACE

	ifdef CONFIG_HAVE_C_RECORDMCOUNT

		BUILD_C_RECORDMCOUNT := y

		export BUILD_C_RECORDMCOUNT

	endif

endif

endif

endif





# We trigger additional mismatches with less inlining

# We trigger additional mismatches with less inlining
@@ -591,6 +597,11 @@ KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow) 
# conserve stack if available

# conserve stack if available

KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)

KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)





# check for 'asm goto'

ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y)

	KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO

endif



# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments

# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments

# But warn user when we do so

# But warn user when we do so

warn-assign = \

warn-assign = \

arch/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -158,4 +158,7 @@ config HAVE_PERF_EVENTS_NMI 
	  subsystem.  Also has support for calculating CPU cycle events

	  subsystem.  Also has support for calculating CPU cycle events

	  to determine how many clock cycles in a given period.

	  to determine how many clock cycles in a given period.





config HAVE_ARCH_JUMP_LABEL

	bool



source "kernel/gcov/Kconfig"
 
source "kernel/gcov/Kconfig"

arch/alpha/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,7 @@ config ALPHA 
	select HAVE_IDE

	select HAVE_IDE

	select HAVE_OPROFILE

	select HAVE_OPROFILE

	select HAVE_SYSCALL_WRAPPERS

	select HAVE_SYSCALL_WRAPPERS

	select HAVE_IRQ_WORK

	select HAVE_PERF_EVENTS

	select HAVE_PERF_EVENTS

	select HAVE_DMA_ATTRS

	select HAVE_DMA_ATTRS

	help

	help

arch/alpha/include/asm/perf_event.h

+0 −5
Original line number Original line Diff line number Diff line 
#ifndef __ASM_ALPHA_PERF_EVENT_H

#ifndef __ASM_ALPHA_PERF_EVENT_H

#define __ASM_ALPHA_PERF_EVENT_H

#define __ASM_ALPHA_PERF_EVENT_H





/* Alpha only supports software events through this interface. */

extern void set_perf_event_pending(void);



#define PERF_EVENT_INDEX_OFFSET 0



#ifdef CONFIG_PERF_EVENTS

#ifdef CONFIG_PERF_EVENTS

extern void init_hw_perf_events(void);

extern void init_hw_perf_events(void);

#else

#else

CRA Git | Maintained and supported by SUSTech CRA and CCSE