diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-03 12:17:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-03 12:17:55 -0400 |
| commit | 22a4e4c435bbc0edccc2e7e5143ce4fbe9679e2d (patch) | |
| tree | 9981477f6f9e4527a9598e636d0ffc7705a322a4 /arch | |
| parent | 70a7c1271e2bfca8ad2bf71f44c516ea2763b9ed (diff) | |
| parent | 6e03bb5ad363fdbe4e1e227cfb78f7978c662e18 (diff) | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/Makefile
Merge reason: resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/misc.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S index b485a87c94e..22e507c8a55 100644 --- a/arch/powerpc/kernel/misc.S +++ b/arch/powerpc/kernel/misc.S | |||
| @@ -128,7 +128,6 @@ _GLOBAL(__restore_cpu_power7) | |||
| 128 | /* place holder */ | 128 | /* place holder */ |
| 129 | blr | 129 | blr |
| 130 | 130 | ||
| 131 | #ifdef CONFIG_EVENT_TRACING | ||
| 132 | /* | 131 | /* |
| 133 | * Get a minimal set of registers for our caller's nth caller. | 132 | * Get a minimal set of registers for our caller's nth caller. |
| 134 | * r3 = regs pointer, r5 = n. | 133 | * r3 = regs pointer, r5 = n. |
| @@ -154,4 +153,3 @@ _GLOBAL(perf_arch_fetch_caller_regs) | |||
| 154 | PPC_STL r4,_NIP-STACK_FRAME_OVERHEAD(r3) | 153 | PPC_STL r4,_NIP-STACK_FRAME_OVERHEAD(r3) |
| 155 | PPC_STL r7,_LINK-STACK_FRAME_OVERHEAD(r3) | 154 | PPC_STL r7,_LINK-STACK_FRAME_OVERHEAD(r3) |
| 156 | blr | 155 | blr |
| 157 | #endif /* CONFIG_EVENT_TRACING */ | ||