Commit 1d229d54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf symbols: Check '/tmp/perf-' symbol file ownership
  perf sched: Usage leftover from trace -> script rename
  perf sched: Do not delete session object prematurely
  perf tools: Check $HOME/.perfconfig ownership
  perf, x86: Add model 45 SandyBridge support
  perf tools: Add support to install perf python extension
  perf tools: do not look at ./config for configuration
  perf tools: Make clean leaves some files
  perf lock: Dropping unsupported ':r' modifier
  perf probe: Fix coredump introduced by probe module option
  jump label: Reduce the cycle count by changing the link order
  perf report: Use ui__warning in some more places
  perf python: Add PERF_RECORD_{LOST,READ,SAMPLE} routine tables
  perf evlist: Introduce 'disable' method
  trace events: Update version number reference to new 3.x scheme for EVENT_POWER_TRACING_DEPRECATED
  perf buildid-cache: Zero out buffer of filenames when adding/removing buildid
parents d16adea3 7676ebba

arch/x86/kernel/cpu/perf_event_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -1590,6 +1590,7 @@ static __init int intel_pmu_init(void) 
		break;



	case 42: /* SandyBridge */

	case 45: /* SandyBridge, "Romely-EP" */

		memcpy(hw_cache_event_ids, snb_hw_cache_event_ids,

		       sizeof(hw_cache_event_ids));

kernel/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ obj-y = sched.o fork.o exec_domain.o panic.o printk.o \ 
	    kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \

	    hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \

	    notifier.o ksysfs.o pm_qos_params.o sched_clock.o cred.o \

	    async.o range.o jump_label.o

	    async.o range.o

obj-y += groups.o



ifdef CONFIG_FUNCTION_TRACER
@@ -107,6 +107,7 @@ obj-$(CONFIG_PERF_EVENTS) += events/ 
obj-$(CONFIG_USER_RETURN_NOTIFIER) += user-return-notifier.o

obj-$(CONFIG_PADATA) += padata.o

obj-$(CONFIG_CRASH_DUMP) += crash_dump.o

obj-$(CONFIG_JUMP_LABEL) += jump_label.o



ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)

# According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is

kernel/trace/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ config EVENT_POWER_TRACING_DEPRECATED 
	  power:power_frequency

	  This is for userspace compatibility

	  and will vanish after 5 kernel iterations,

	  namely 2.6.41.

	  namely 3.1.



config CONTEXT_SWITCH_TRACER

	bool

tools/perf/Makefile

+14 −7
Original line number Diff line number Diff line
@@ -181,9 +181,9 @@ strip-libs = $(filter-out -l%,$(1)) 


$(OUTPUT)python/perf.so: $(PYRF_OBJS)

	$(QUIET_GEN)CFLAGS='$(BASIC_CFLAGS)' $(PYTHON_WORD) util/setup.py \

	  --quiet build_ext \

	  --build-lib='$(OUTPUT)python' \

	  --build-temp='$(OUTPUT)python/temp'

	  --quiet build_ext; \

	mkdir -p $(OUTPUT)python && \

	cp $(PYTHON_EXTBUILD_LIB)perf.so $(OUTPUT)python/

#

# No Perl scripts right now:

#
@@ -509,9 +509,13 @@ else 


  PYTHON_WORD := $(call shell-wordify,$(PYTHON))



  python-clean := $(PYTHON_WORD) util/setup.py clean \

    --build-lib='$(OUTPUT)python' \

    --build-temp='$(OUTPUT)python/temp'

  # python extension build directories

  PYTHON_EXTBUILD     := $(OUTPUT)python_ext_build/

  PYTHON_EXTBUILD_LIB := $(PYTHON_EXTBUILD)lib/

  PYTHON_EXTBUILD_TMP := $(PYTHON_EXTBUILD)tmp/

  export PYTHON_EXTBUILD_LIB PYTHON_EXTBUILD_TMP



  python-clean := rm -rf $(PYTHON_EXTBUILD) $(OUTPUT)python/perf.so



  ifdef NO_LIBPYTHON

    $(call disable-python)
@@ -868,6 +872,9 @@ install: all 
	$(INSTALL) scripts/python/*.py -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python'

	$(INSTALL) scripts/python/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'



install-python_ext:

	$(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)'



install-doc:

	$(MAKE) -C Documentation install
@@ -895,7 +902,7 @@ quick-install-html: 
### Cleaning rules



clean:

	$(RM) $(OUTPUT){*.o,*/*.o,*/*/*.o,*/*/*/*.o,$(LIB_FILE),perf-archive}

	$(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf.o $(LANG_BINDINGS)

	$(RM) $(ALL_PROGRAMS) perf

	$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope*

	$(MAKE) -C Documentation/ clean

tools/perf/builtin-lock.c

+4 −4
Original line number Diff line number Diff line
@@ -942,10 +942,10 @@ static const char *record_args[] = { 
	"-f",

	"-m", "1024",

	"-c", "1",

	"-e", "lock:lock_acquire:r",

	"-e", "lock:lock_acquired:r",

	"-e", "lock:lock_contended:r",

	"-e", "lock:lock_release:r",

	"-e", "lock:lock_acquire",

	"-e", "lock:lock_acquired",

	"-e", "lock:lock_contended",

	"-e", "lock:lock_release",

};



static int __cmd_record(int argc, const char **argv)

CRA Git | Maintained and supported by SUSTech CRA and CCSE