diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-10-04 15:40:42 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-09 21:01:56 +1000 |
| commit | eef686a0095430bdd6c1942f86dd2b543e66679f (patch) | |
| tree | 31497aedd2560e8ee2e43b7e5c397d24fbad903d /arch/powerpc/oprofile | |
| parent | 105c13dd7a29fe2d18643b851d7f1c1cbc4315ed (diff) | |
| download | kernel_samsung_smdk4412-eef686a0095430bdd6c1942f86dd2b543e66679f.zip kernel_samsung_smdk4412-eef686a0095430bdd6c1942f86dd2b543e66679f.tar.gz kernel_samsung_smdk4412-eef686a0095430bdd6c1942f86dd2b543e66679f.tar.bz2 | |
[POWERPC] cell: Move cbe_regs.h to include/asm-powerpc/cell-regs.h
The new Cell EDAC driver needs that file, oprofile also does ugly
path tricks to get to it, it's time to move it to asm-powerpc. While
at it, rename it to be consistent with cell-pmu.h (and dashes look
nicer than underscores anyway).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/oprofile')
| -rw-r--r-- | arch/powerpc/oprofile/cell/pr_util.h | 3 | ||||
| -rw-r--r-- | arch/powerpc/oprofile/op_model_cell.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/oprofile/cell/pr_util.h b/arch/powerpc/oprofile/cell/pr_util.h index e5704f0..22e4e8d 100644 --- a/arch/powerpc/oprofile/cell/pr_util.h +++ b/arch/powerpc/oprofile/cell/pr_util.h @@ -17,10 +17,9 @@ #include <linux/cpumask.h> #include <linux/oprofile.h> #include <asm/cell-pmu.h> +#include <asm/cell-regs.h> #include <asm/spu.h> -#include "../../platforms/cell/cbe_regs.h" - /* Defines used for sync_start */ #define SKIP_GENERIC_SYNC 0 #define SYNC_START_ERROR -1 diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c index d928b54..bb6bff5 100644 --- a/arch/powerpc/oprofile/op_model_cell.c +++ b/arch/powerpc/oprofile/op_model_cell.c @@ -35,9 +35,9 @@ #include <asm/reg.h> #include <asm/rtas.h> #include <asm/system.h> +#include <asm/cell-regs.h> #include "../platforms/cell/interrupt.h" -#include "../platforms/cell/cbe_regs.h" #include "cell/pr_util.h" static void cell_global_stop_spu(void); |