diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-05 09:47:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-05 09:47:14 +0200 |
| commit | 00e8976200665eec2fa9264d61885b4d1384d4f0 (patch) | |
| tree | 5554648e4411fcd6909214f71370348567cf4b2d /tools/perf | |
| parent | 540804b5c52065a87d826f7714b18a3ec0b269f9 (diff) | |
| parent | 0f940cb7d970f4fd569bb5f9f49774422f2ccbee (diff) | |
| download | kernel_samsung_smdk4412-00e8976200665eec2fa9264d61885b4d1384d4f0.zip kernel_samsung_smdk4412-00e8976200665eec2fa9264d61885b4d1384d4f0.tar.gz kernel_samsung_smdk4412-00e8976200665eec2fa9264d61885b4d1384d4f0.tar.bz2 | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/util/ui/browsers/hists.c
Merge reason: fix the conflict and merge in changes for dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/Makefile | 2 | ||||
| -rw-r--r-- | tools/perf/util/trace-event-scripting.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index fe1e307..d1db0f6 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -1035,7 +1035,7 @@ builtin-revert.o wt-status.o: wt-status.h # we compile into subdirectories. if the target directory is not the source directory, they might not exists. So # we depend the various files onto their directories. DIRECTORY_DEPS = $(LIB_OBJS) $(BUILTIN_OBJS) $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h -$(DIRECTORY_DEPS): $(sort $(dir $(DIRECTORY_DEPS))) +$(DIRECTORY_DEPS): | $(sort $(dir $(DIRECTORY_DEPS))) # In the second step, we make a rule to actually create these directories $(sort $(dir $(DIRECTORY_DEPS))): $(QUIET_MKDIR)$(MKDIR) -p $@ 2>/dev/null diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c index 7ea983a..f7af2fc 100644 --- a/tools/perf/util/trace-event-scripting.c +++ b/tools/perf/util/trace-event-scripting.c @@ -97,7 +97,7 @@ void setup_python_scripting(void) register_python_scripting(&python_scripting_unsupported_ops); } #else -struct scripting_ops python_scripting_ops; +extern struct scripting_ops python_scripting_ops; void setup_python_scripting(void) { @@ -158,7 +158,7 @@ void setup_perl_scripting(void) register_perl_scripting(&perl_scripting_unsupported_ops); } #else -struct scripting_ops perl_scripting_ops; +extern struct scripting_ops perl_scripting_ops; void setup_perl_scripting(void) { |