Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] powerpc: merge oprofile headers

Browse Source 
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>
This commit is contained in:
Stephen Rothwell 2005-09-19 23:21:15 +10:00 committed by Paul Mackerras
parent a3e48c10cc
commit 654810ec89
4 changed files with 17 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/ppc/oprofile/common.c
View File

@ -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;

45
arch/ppc/oprofile/op_impl.h
View File

@ -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 */

3
arch/ppc/oprofile/op_model_fsl_booke.c
View File

@ -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];

18
include/asm-ppc64/oprofile_impl.h → include/asm-powerpc/oprofile_impl.h
View File

@ -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 */