[PATCH] powerpc: merge oprofile headers

Merge include/asm-ppc64/oprofile_ipml.h and arch/ppc/oprofile/op_impl.h
into include/asm-powerpc/oprofile_ipml.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 0 insertions, 111 deletions

diff --git a/include/asm-ppc64/oprofile_impl.h b/include/asm-ppc64/oprofile_impl.h
deleted file mode 100644
index 50420e715f05..000000000000
--- a/include/asm-ppc64/oprofile_impl.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2004 Anton Blanchard <anton@au.ibm.com>, IBM
- *
- * Based on alpha version.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#ifndef OP_IMPL_H
-#define OP_IMPL_H 1
-
-#define OP_MAX_COUNTER 8
-
-/* Per-counter configuration as set via oprofilefs.  */
-struct op_counter_config {
-        unsigned long valid;
-        unsigned long enabled;
-        unsigned long event;
-        unsigned long count;
-        unsigned long kernel;
-        /* We dont support per counter user/kernel selection */
-        unsigned long user;
-        unsigned long unit_mask;
-};
-
-/* System-wide configuration as set via oprofilefs.  */
-struct op_system_config {
-        unsigned long mmcr0;
-        unsigned long mmcr1;
-        unsigned long mmcra;
-        unsigned long enable_kernel;
-        unsigned long enable_user;
-        unsigned long backtrace_spinlocks;
-};
-
-/* Per-arch configuration */
-struct op_powerpc_model {
-        void (*reg_setup) (struct op_counter_config *,
-                           struct op_system_config *,
-                           int num_counters);
-        void (*cpu_setup) (void *);
-        void (*start) (struct op_counter_config *);
-        void (*stop) (void);
-        void (*handle_interrupt) (struct pt_regs *,
-                                  struct op_counter_config *);
-        int num_counters;
-};
-
-extern struct op_powerpc_model op_model_rs64;
-extern struct op_powerpc_model op_model_power4;
-
-static inline unsigned int ctr_read(unsigned int i)
-{
-        switch(i) {
-        case 0:
-                return mfspr(SPRN_PMC1);
-        case 1:
-                return mfspr(SPRN_PMC2);
-        case 2:
-                return mfspr(SPRN_PMC3);
-        case 3:
-                return mfspr(SPRN_PMC4);
-        case 4:
-                return mfspr(SPRN_PMC5);
-        case 5:
-                return mfspr(SPRN_PMC6);
-        case 6:
-                return mfspr(SPRN_PMC7);
-        case 7:
-                return mfspr(SPRN_PMC8);
-        default:
-                return 0;
-        }
-}
-
-static inline void ctr_write(unsigned int i, unsigned int val)
-{
-        switch(i) {
-        case 0:
-                mtspr(SPRN_PMC1, val);
-                break;
-        case 1:
-                mtspr(SPRN_PMC2, val);
-                break;
-        case 2:
-                mtspr(SPRN_PMC3, val);
-                break;
-        case 3:
-                mtspr(SPRN_PMC4, val);
-                break;
-        case 4:
-                mtspr(SPRN_PMC5, val);
-                break;
-        case 5:
-                mtspr(SPRN_PMC6, val);
-                break;
-        case 6:
-                mtspr(SPRN_PMC7, val);
-                break;
-        case 7:
-                mtspr(SPRN_PMC8, val);
-                break;
-        default:
-                break;
-        }
-}
-
-#endif