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

Commit a3e48c10 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[PATCH] powerpc: rename op_ppc{32,64}_model to op_powerpc_model 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent d9e5b83b

arch/ppc/oprofile/common.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ 




#include "op_impl.h"

#include "op_impl.h"





static struct op_ppc32_model *model;

static struct op_powerpc_model *model;





static struct op_counter_config ctr[OP_MAX_COUNTER];

static struct op_counter_config ctr[OP_MAX_COUNTER];

static struct op_system_config sys;

static struct op_system_config sys;

arch/ppc/oprofile/op_impl.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ struct op_system_config { 
};

};





/* Per-arch configuration */

/* Per-arch configuration */

struct op_ppc32_model {

struct op_powerpc_model {

	void (*reg_setup) (struct op_counter_config *,

	void (*reg_setup) (struct op_counter_config *,

			   struct op_system_config *,

			   struct op_system_config *,

			   int num_counters);

			   int num_counters);

arch/ppc/oprofile/op_model_fsl_booke.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -176,7 +176,7 @@ static void fsl_booke_handle_interrupt(struct pt_regs *regs, 
	pmc_start_ctrs(1);

	pmc_start_ctrs(1);

}

}





struct op_ppc32_model op_model_fsl_booke = {

struct op_powerpc_model op_model_fsl_booke = {

	.reg_setup		= fsl_booke_reg_setup,

	.reg_setup		= fsl_booke_reg_setup,

	.start			= fsl_booke_start,

	.start			= fsl_booke_start,

	.stop			= fsl_booke_stop,

	.stop			= fsl_booke_stop,

arch/ppc64/oprofile/common.c

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

#include <asm/cputable.h>

#include <asm/oprofile_impl.h>

#include <asm/oprofile_impl.h>





static struct op_ppc64_model *model;

static struct op_powerpc_model *model;





static struct op_counter_config ctr[OP_MAX_COUNTER];

static struct op_counter_config ctr[OP_MAX_COUNTER];

static struct op_system_config sys;

static struct op_system_config sys;

arch/ppc64/oprofile/op_model_power4.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -300,7 +300,7 @@ static void power4_handle_interrupt(struct pt_regs *regs, 
	mtspr(SPRN_MMCR0, mmcr0);

	mtspr(SPRN_MMCR0, mmcr0);

}

}





struct op_ppc64_model op_model_power4 = {

struct op_powerpc_model op_model_power4 = {

	.reg_setup		= power4_reg_setup,

	.reg_setup		= power4_reg_setup,

	.cpu_setup		= power4_cpu_setup,

	.cpu_setup		= power4_cpu_setup,

	.start			= power4_start,

	.start			= power4_start,