summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2005-05-31 14:39:29 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-31 14:54:18 -0700
commitf50734569c25c4e902bd3d0fb2e5bd93a200cc75 (patch)
treec462b613c1fe385a7deec7f0ebe8ef7bd4556e13 /arch
parent2e214953295dd33fc62d43ac7ec91997afad75bb (diff)
downloadlinux-f50734569c25c4e902bd3d0fb2e5bd93a200cc75.tar.bz2
[PATCH] ppc64: allow timer based profiling on iseries
We used to have an iseries specific profiler that used /proc/profile. Now thats gone we can use the generic timer based stuff. Signed-off-by: Anton Blanchard <anton@samba.org> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/ppc64/kernel/time.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c
index 3d54745108c7..33364a7d2cd2 100644
--- a/arch/ppc64/kernel/time.c
+++ b/arch/ppc64/kernel/time.c
@@ -325,9 +325,7 @@ int timer_interrupt(struct pt_regs * regs)
irq_enter();
-#ifndef CONFIG_PPC_ISERIES
profile_tick(CPU_PROFILING, regs);
-#endif
lpaca->lppaca.int_dword.fields.decr_int = 0;