diff options
| author | Tony Luck <tony.luck@intel.com> | 2008-10-17 13:51:16 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-10-17 13:51:16 -0700 |
| commit | 9224652cc76417bfe779bcdb1243cf0b083e3eee (patch) | |
| tree | d80d0f2d00d9eda6500deedc9488071f005f732b /arch/ia64/kernel/perfmon.c | |
| parent | 4d4230c27f380745b7fc30c0906402eede3b2cff (diff) | |
| parent | 680973edf122fd95735ecfc077cf79645d2e5081 (diff) | |
Pull utrace into release branch
Diffstat (limited to 'arch/ia64/kernel/perfmon.c')
| -rw-r--r-- | arch/ia64/kernel/perfmon.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index fc8f3509df2..ada4605d122 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c @@ -40,6 +40,7 @@ #include <linux/capability.h> #include <linux/rcupdate.h> #include <linux/completion.h> +#include <linux/tracehook.h> #include <asm/errno.h> #include <asm/intrinsics.h> @@ -3684,7 +3685,7 @@ pfm_restart(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs) PFM_SET_WORK_PENDING(task, 1); - tsk_set_notify_resume(task); + set_notify_resume(task); /* * XXX: send reschedule if task runs on another CPU @@ -5044,8 +5045,6 @@ pfm_handle_work(void) PFM_SET_WORK_PENDING(current, 0); - tsk_clear_notify_resume(current); - regs = task_pt_regs(current); /* @@ -5414,7 +5413,7 @@ pfm_overflow_handler(struct task_struct *task, pfm_context_t *ctx, u64 pmc0, str * when coming from ctxsw, current still points to the * previous task, therefore we must work with task and not current. */ - tsk_set_notify_resume(task); + set_notify_resume(task); } /* * defer until state is changed (shorten spin window). the context is locked |