aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-09-19 23:21:15 +1000
committerPaul Mackerras <paulus@samba.org>2005-09-21 19:21:08 +1000
commit654810ec899ea5f2fc2138fca1793b603d481ff4 (patch)
tree7b5e4d411d275a22606b81e0725ebc06acb7bff6
parenta3e48c10cca3287a845435dd8ca58ecbde72d847 (diff)
[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>
-rw-r--r--arch/ppc/oprofile/common.c3
-rw-r--r--arch/ppc/oprofile/op_impl.h45
-rw-r--r--arch/ppc/oprofile/op_model_fsl_booke.c3
-rw-r--r--include/asm-powerpc/oprofile_impl.h (renamed from include/asm-ppc64/oprofile_impl.h)18
4 files changed, 17 insertions, 52 deletions
diff --git a/arch/ppc/oprofile/common.c b/arch/ppc/oprofile/common.c
index a67d438a714..f63bee23f20 100644
--- a/arch/ppc/oprofile/common.c
+++ b/arch/ppc/oprofile/common.c
@@ -22,8 +22,7 @@
#include <asm/system.h>
#include <asm/perfmon.h>
#include <asm/cputable.h>
-
-#include "op_impl.h"
+#include <asm/oprofile_impl.h>
static struct op_powerpc_model *model;
diff --git a/arch/ppc/oprofile/op_impl.h b/arch/ppc/oprofile/op_impl.h
deleted file mode 100644
index 297f3097d2d..00000000000
--- a/arch/ppc/oprofile/op_impl.h
+++ /dev/null
@@ -1,45 +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 enabled;
- unsigned long event;
- unsigned long count;
- unsigned long kernel;
- unsigned long user;
- unsigned long unit_mask;
-};
-
-/* System-wide configuration as set via oprofilefs. */
-struct op_system_config {
- unsigned long enable_kernel;
- unsigned long enable_user;
-};
-
-/* Per-arch configuration */
-struct op_powerpc_model {
- void (*reg_setup) (struct op_counter_config *,
- struct op_system_config *,
- int num_counters);
- void (*start) (struct op_counter_config *);
- void (*stop) (void);
- void (*handle_interrupt) (struct pt_regs *,
- struct op_counter_config *);
- int num_counters;
-};
-
-#endif /* OP_IMPL_H */
diff --git a/arch/ppc/oprofile/op_model_fsl_booke.c b/arch/ppc/oprofile/op_model_fsl_booke.c
index 8fc60f6055a..1917f8df8a8 100644
--- a/arch/ppc/oprofile/op_model_fsl_booke.c
+++ b/arch/ppc/oprofile/op_model_fsl_booke.c
@@ -25,8 +25,7 @@
#include <asm/reg_booke.h>
#include <asm/page.h>
#include <asm/perfmon.h>
-
-#include "op_impl.h"
+#include <asm/oprofile_impl.h>
static unsigned long reset_value[OP_MAX_COUNTER];
diff --git a/include/asm-ppc64/oprofile_impl.h b/include/asm-powerpc/oprofile_impl.h
index 50420e715f0..8013cd273ce 100644
--- a/include/asm-ppc64/oprofile_impl.h
+++ b/include/asm-powerpc/oprofile_impl.h
@@ -9,31 +9,39 @@
* 2 of the License, or (at your option) any later version.
*/
-#ifndef OP_IMPL_H
-#define OP_IMPL_H 1
+#ifndef _ASM_POWERPC_OPROFILE_IMPL_H
+#define _ASM_POWERPC_OPROFILE_IMPL_H
#define OP_MAX_COUNTER 8
/* Per-counter configuration as set via oprofilefs. */
struct op_counter_config {
+#ifdef __powerpc64__
unsigned long valid;
+#endif
unsigned long enabled;
unsigned long event;
unsigned long count;
unsigned long kernel;
+#ifdef __powerpc64__
/* We dont support per counter user/kernel selection */
+#endif
unsigned long user;
unsigned long unit_mask;
};
/* System-wide configuration as set via oprofilefs. */
struct op_system_config {
+#ifdef __powerpc64__
unsigned long mmcr0;
unsigned long mmcr1;
unsigned long mmcra;
+#endif
unsigned long enable_kernel;
unsigned long enable_user;
+#ifdef __powerpc64__
unsigned long backtrace_spinlocks;
+#endif
};
/* Per-arch configuration */
@@ -41,7 +49,9 @@ struct op_powerpc_model {
void (*reg_setup) (struct op_counter_config *,
struct op_system_config *,
int num_counters);
+#ifdef __powerpc64__
void (*cpu_setup) (void *);
+#endif
void (*start) (struct op_counter_config *);
void (*stop) (void);
void (*handle_interrupt) (struct pt_regs *,
@@ -49,6 +59,7 @@ struct op_powerpc_model {
int num_counters;
};
+#ifdef __powerpc64__
extern struct op_powerpc_model op_model_rs64;
extern struct op_powerpc_model op_model_power4;
@@ -107,5 +118,6 @@ static inline void ctr_write(unsigned int i, unsigned int val)
break;
}
}
+#endif /* __powerpc64__ */
-#endif
+#endif /* _ASM_POWERPC_OPROFILE_IMPL_H */