|
@@ -1710,7 +1710,7 @@ static void
|
|
|
pfm_syswide_force_stop(void *info)
|
|
|
{
|
|
|
pfm_context_t *ctx = (pfm_context_t *)info;
|
|
|
- struct pt_regs *regs = ia64_task_regs(current);
|
|
|
+ struct pt_regs *regs = task_pt_regs(current);
|
|
|
struct task_struct *owner;
|
|
|
unsigned long flags;
|
|
|
int ret;
|
|
@@ -1815,7 +1815,7 @@ pfm_flush(struct file *filp)
|
|
|
is_system = ctx->ctx_fl_system;
|
|
|
|
|
|
task = PFM_CTX_TASK(ctx);
|
|
|
- regs = ia64_task_regs(task);
|
|
|
+ regs = task_pt_regs(task);
|
|
|
|
|
|
DPRINT(("ctx_state=%d is_current=%d\n",
|
|
|
state,
|
|
@@ -1945,7 +1945,7 @@ pfm_close(struct inode *inode, struct file *filp)
|
|
|
is_system = ctx->ctx_fl_system;
|
|
|
|
|
|
task = PFM_CTX_TASK(ctx);
|
|
|
- regs = ia64_task_regs(task);
|
|
|
+ regs = task_pt_regs(task);
|
|
|
|
|
|
DPRINT(("ctx_state=%d is_current=%d\n",
|
|
|
state,
|
|
@@ -4052,7 +4052,7 @@ pfm_stop(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs)
|
|
|
*/
|
|
|
ia64_psr(regs)->up = 0;
|
|
|
} else {
|
|
|
- tregs = ia64_task_regs(task);
|
|
|
+ tregs = task_pt_regs(task);
|
|
|
|
|
|
/*
|
|
|
* stop monitoring at the user level
|
|
@@ -4134,7 +4134,7 @@ pfm_start(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs)
|
|
|
ia64_psr(regs)->up = 1;
|
|
|
|
|
|
} else {
|
|
|
- tregs = ia64_task_regs(ctx->ctx_task);
|
|
|
+ tregs = task_pt_regs(ctx->ctx_task);
|
|
|
|
|
|
/*
|
|
|
* start monitoring at the kernel level the next
|
|
@@ -4404,7 +4404,7 @@ pfm_context_load(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs)
|
|
|
/*
|
|
|
* when not current, task MUST be stopped, so this is safe
|
|
|
*/
|
|
|
- regs = ia64_task_regs(task);
|
|
|
+ regs = task_pt_regs(task);
|
|
|
|
|
|
/* force a full reload */
|
|
|
ctx->ctx_last_activation = PFM_INVALID_ACTIVATION;
|
|
@@ -4530,7 +4530,7 @@ pfm_context_unload(pfm_context_t *ctx, void *arg, int count, struct pt_regs *reg
|
|
|
/*
|
|
|
* per-task mode
|
|
|
*/
|
|
|
- tregs = task == current ? regs : ia64_task_regs(task);
|
|
|
+ tregs = task == current ? regs : task_pt_regs(task);
|
|
|
|
|
|
if (task == current) {
|
|
|
/*
|
|
@@ -4593,7 +4593,7 @@ pfm_exit_thread(struct task_struct *task)
|
|
|
{
|
|
|
pfm_context_t *ctx;
|
|
|
unsigned long flags;
|
|
|
- struct pt_regs *regs = ia64_task_regs(task);
|
|
|
+ struct pt_regs *regs = task_pt_regs(task);
|
|
|
int ret, state;
|
|
|
int free_ok = 0;
|
|
|
|
|
@@ -4926,7 +4926,7 @@ restart_args:
|
|
|
if (unlikely(ret)) goto abort_locked;
|
|
|
|
|
|
skip_fd:
|
|
|
- ret = (*func)(ctx, args_k, count, ia64_task_regs(current));
|
|
|
+ ret = (*func)(ctx, args_k, count, task_pt_regs(current));
|
|
|
|
|
|
call_made = 1;
|
|
|
|
|
@@ -5050,7 +5050,7 @@ pfm_handle_work(void)
|
|
|
|
|
|
pfm_clear_task_notify();
|
|
|
|
|
|
- regs = ia64_task_regs(current);
|
|
|
+ regs = task_pt_regs(current);
|
|
|
|
|
|
/*
|
|
|
* extract reason for being here and clear
|
|
@@ -5794,7 +5794,7 @@ pfm_syst_wide_update_task(struct task_struct *task, unsigned long info, int is_c
|
|
|
* on every CPU, so we can rely on the pid to identify the idle task.
|
|
|
*/
|
|
|
if ((info & PFM_CPUINFO_EXCL_IDLE) == 0 || task->pid) {
|
|
|
- regs = ia64_task_regs(task);
|
|
|
+ regs = task_pt_regs(task);
|
|
|
ia64_psr(regs)->pp = is_ctxswin ? dcr_pp : 0;
|
|
|
return;
|
|
|
}
|
|
@@ -5877,7 +5877,7 @@ pfm_save_regs(struct task_struct *task)
|
|
|
flags = pfm_protect_ctx_ctxsw(ctx);
|
|
|
|
|
|
if (ctx->ctx_state == PFM_CTX_ZOMBIE) {
|
|
|
- struct pt_regs *regs = ia64_task_regs(task);
|
|
|
+ struct pt_regs *regs = task_pt_regs(task);
|
|
|
|
|
|
pfm_clear_psr_up();
|
|
|
|
|
@@ -6077,7 +6077,7 @@ pfm_load_regs (struct task_struct *task)
|
|
|
BUG_ON(psr & IA64_PSR_I);
|
|
|
|
|
|
if (unlikely(ctx->ctx_state == PFM_CTX_ZOMBIE)) {
|
|
|
- struct pt_regs *regs = ia64_task_regs(task);
|
|
|
+ struct pt_regs *regs = task_pt_regs(task);
|
|
|
|
|
|
BUG_ON(ctx->ctx_smpl_hdr);
|
|
|
|
|
@@ -6446,7 +6446,7 @@ pfm_alt_save_pmu_state(void *data)
|
|
|
{
|
|
|
struct pt_regs *regs;
|
|
|
|
|
|
- regs = ia64_task_regs(current);
|
|
|
+ regs = task_pt_regs(current);
|
|
|
|
|
|
DPRINT(("called\n"));
|
|
|
|
|
@@ -6472,7 +6472,7 @@ pfm_alt_restore_pmu_state(void *data)
|
|
|
{
|
|
|
struct pt_regs *regs;
|
|
|
|
|
|
- regs = ia64_task_regs(current);
|
|
|
+ regs = task_pt_regs(current);
|
|
|
|
|
|
DPRINT(("called\n"));
|
|
|
|
|
@@ -6754,7 +6754,7 @@ dump_pmu_state(const char *from)
|
|
|
local_irq_save(flags);
|
|
|
|
|
|
this_cpu = smp_processor_id();
|
|
|
- regs = ia64_task_regs(current);
|
|
|
+ regs = task_pt_regs(current);
|
|
|
info = PFM_CPUINFO_GET();
|
|
|
dcr = ia64_getreg(_IA64_REG_CR_DCR);
|
|
|
|