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

Commit dca85932 authored by Anton Blanchard's avatar Anton Blanchard Committed by Paul Mackerras
Browse files

[PATCH] ppc64: Move oprofile_impl.h into include/asm-ppc64 



Move oprofile_impl.h into include/asm-ppc64 in preparation for moving
oprofile_model into cpu feature struct.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 1a410d88

arch/ppc64/oprofile/common.c

+1 −4
Original line number Diff line number Diff line
@@ -17,11 +17,8 @@ 
#include <asm/system.h>

#include <asm/pmc.h>

#include <asm/cputable.h>

#include <asm/oprofile_impl.h>



#include "op_impl.h"



extern struct op_ppc64_model op_model_rs64;

extern struct op_ppc64_model op_model_power4;

static struct op_ppc64_model *model;



static struct op_counter_config ctr[OP_MAX_COUNTER];

arch/ppc64/oprofile/op_model_power4.c

+1 −2
Original line number Diff line number Diff line
@@ -16,11 +16,10 @@ 
#include <asm/cputable.h>

#include <asm/systemcfg.h>

#include <asm/rtas.h>

#include <asm/oprofile_impl.h>



#define dbg(args...)



#include "op_impl.h"



static unsigned long reset_value[OP_MAX_COUNTER];



static int oprofile_running;

arch/ppc64/oprofile/op_model_rs64.c

+1 −2
Original line number Diff line number Diff line
@@ -14,11 +14,10 @@ 
#include <asm/system.h>

#include <asm/processor.h>

#include <asm/cputable.h>

#include <asm/oprofile_impl.h>



#define dbg(args...)



#include "op_impl.h"



static void ctrl_write(unsigned int i, unsigned int val)

{

	unsigned int tmp = 0;

arch/ppc64/oprofile/op_impl.h→include/asm-ppc64/oprofile_impl.h

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ struct op_ppc64_model { 
	int num_counters;

};



extern struct op_ppc64_model op_model_rs64;

extern struct op_ppc64_model op_model_power4;



static inline unsigned int ctr_read(unsigned int i)

{

	switch(i) {