diff options
| author | Tony Luck <tony.luck@intel.com> | 2009-06-17 09:35:24 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2009-06-17 09:35:24 -0700 |
| commit | 27f70c3117194f98beb009dc48bb2aa267f505bf (patch) | |
| tree | 22afa3fb31376da9e37f09a78745afe3f16fde8a /arch/ia64/kernel/perfmon.c | |
| parent | d186b86ffcad713a1dd3d03e9d4ce2d59f61a1ed (diff) | |
| parent | e088a4ad7fa53c3dc3c29f930025f41ccf01953e (diff) | |
| download | linux-27f70c3117194f98beb009dc48bb2aa267f505bf.tar.gz linux-27f70c3117194f98beb009dc48bb2aa267f505bf.tar.bz2 linux-27f70c3117194f98beb009dc48bb2aa267f505bf.zip | |
Pull for-2.6.31 into release
Diffstat (limited to 'arch/ia64/kernel/perfmon.c')
| -rw-r--r-- | arch/ia64/kernel/perfmon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index bdc176cb5e85..abce2468a40b 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c @@ -312,7 +312,7 @@ typedef struct pfm_context { unsigned long th_pmcs[PFM_NUM_PMC_REGS]; /* PMC thread save state */ unsigned long th_pmds[PFM_NUM_PMD_REGS]; /* PMD thread save state */ - u64 ctx_saved_psr_up; /* only contains psr.up value */ + unsigned long ctx_saved_psr_up; /* only contains psr.up value */ unsigned long ctx_last_activation; /* context last activation number for last_cpu */ unsigned int ctx_last_cpu; /* CPU id of current or last CPU used (SMP only) */ @@ -5213,8 +5213,8 @@ pfm_end_notify_user(pfm_context_t *ctx) * main overflow processing routine. * it can be called from the interrupt path or explicitly during the context switch code */ -static void -pfm_overflow_handler(struct task_struct *task, pfm_context_t *ctx, u64 pmc0, struct pt_regs *regs) +static void pfm_overflow_handler(struct task_struct *task, pfm_context_t *ctx, + unsigned long pmc0, struct pt_regs *regs) { pfm_ovfl_arg_t *ovfl_arg; unsigned long mask; |