Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eef686a0 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

[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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 105c13dd

arch/powerpc/oprofile/cell/pr_util.h

+1 −2
Original line number Diff line number Diff line
@@ -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

arch/powerpc/oprofile/op_model_cell.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/powerpc/platforms/cell/cbe_cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <asm/machdep.h>

#include <asm/of_platform.h>

#include <asm/prom.h>

#include "cbe_regs.h"

#include <asm/cell-regs.h>

#include "cbe_cpufreq.h"



static DEFINE_MUTEX(cbe_switch_mutex);

arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c

+1 −1
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 
#include <linux/time.h>

#include <asm/machdep.h>

#include <asm/hw_irq.h>

#include <asm/cell-regs.h>



#include "cbe_regs.h"

#include "cbe_cpufreq.h"



/* to write to MIC register */

arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c

+1 −1
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ 
#include <asm/processor.h>

#include <asm/prom.h>

#include <asm/pmi.h>

#include <asm/cell-regs.h>



#ifdef DEBUG

#include <asm/time.h>

#endif



#include "cbe_regs.h"

#include "cbe_cpufreq.h"



static u8 pmi_slow_mode_limit[MAX_CBE];