From 73a2b409875f4d0d847fa7f4b09c5ccdf9d48cda Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Sat, 3 Apr 2010 12:22:05 +0200 Subject: [PATCH] --- yaml --- r: 189435 b: refs/heads/master c: 6e03bb5ad363fdbe4e1e227cfb78f7978c662e18 h: refs/heads/master i: 189433: b721de77563bb512531ab66c1809fa587b34420c 189431: 809c104221fc2a33b5809ef1806640d6686c823e v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/misc.S | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7fc2dcea0a24..77eb22cf7db5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26d80aa782e708c380a47601779d42d30bf016d6 +refs/heads/master: 6e03bb5ad363fdbe4e1e227cfb78f7978c662e18 diff --git a/trunk/arch/powerpc/kernel/misc.S b/trunk/arch/powerpc/kernel/misc.S index b485a87c94e1..22e507c8a556 100644 --- a/trunk/arch/powerpc/kernel/misc.S +++ b/trunk/arch/powerpc/kernel/misc.S @@ -128,7 +128,6 @@ _GLOBAL(__restore_cpu_power7) /* place holder */ blr -#ifdef CONFIG_EVENT_TRACING /* * Get a minimal set of registers for our caller's nth caller. * r3 = regs pointer, r5 = n. @@ -154,4 +153,3 @@ _GLOBAL(perf_arch_fetch_caller_regs) PPC_STL r4,_NIP-STACK_FRAME_OVERHEAD(r3) PPC_STL r7,_LINK-STACK_FRAME_OVERHEAD(r3) blr -#endif /* CONFIG_EVENT_TRACING */