diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-19 23:28:21 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-21 19:21:08 +1000 |
| commit | 82cd02c16be99cba6a97d38488aee8807580a202 (patch) | |
| tree | 36d1d79b87ed91df0a0a91164a3acd21cab2e971 /arch/powerpc/oprofile/common.c | |
| parent | 86a5cddbd9676b129cfa2ed7a1a11759d3b2b512 (diff) | |
| download | blackbird-op-linux-82cd02c16be99cba6a97d38488aee8807580a202.tar.gz blackbird-op-linux-82cd02c16be99cba6a97d38488aee8807580a202.zip | |
[PATCH] powerpc: reduce oprofile/common.c differences
Rename and slightly modify {request,free}_perfmon_irq in the ppc code.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/oprofile/common.c')
| -rw-r--r-- | arch/powerpc/oprofile/common.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c index 486314a0defd..88b4118fd0c5 100644 --- a/arch/powerpc/oprofile/common.c +++ b/arch/powerpc/oprofile/common.c @@ -46,19 +46,12 @@ static void op_handle_interrupt(struct pt_regs *regs) static int op_powerpc_setup(void) { -#ifdef __powerpc64__ int err; /* Grab the hardware */ err = reserve_pmc_hardware(op_handle_interrupt); if (err) return err; -#else /* __powerpc64__ */ - /* Install our interrupt handler into the existing hook. */ - if (request_perfmon_irq(&op_handle_interrupt)) - return -EBUSY; - mb(); -#endif /* __powerpc64__ */ /* Pre-compute the values to stuff in the hardware registers. */ model->reg_setup(ctr, &sys, model->num_counters); @@ -78,13 +71,7 @@ static int op_powerpc_setup(void) static void op_powerpc_shutdown(void) { -#ifdef __powerpc64__ release_pmc_hardware(); -#else /* __powerpc64__ */ - mb(); - /* Remove our interrupt handler. We may be removing this module. */ - free_perfmon_irq(); -#endif /* __powerpc64__ */ } static void op_powerpc_cpu_start(void *dummy) |
