git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unused #include <version.h>'s
[safe/jmp/linux-2.6]
/
arch
/
ia64
/
kernel
/
perfmon.c
diff --git
a/arch/ia64/kernel/perfmon.c
b/arch/ia64/kernel/perfmon.c
index
19d4493
..
6543a55
100644
(file)
--- 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/capability.h>
#include <linux/rcupdate.h>
#include <linux/completion.h>
+#include <linux/tracehook.h>
#include <asm/errno.h>
#include <asm/intrinsics.h>
#include <asm/errno.h>
#include <asm/intrinsics.h>
@@
-1994,11
+1995,6
@@
pfm_close(struct inode *inode, struct file *filp)
return -EBADF;
}
return -EBADF;
}
- if (filp->f_flags & FASYNC) {
- DPRINT(("cleaning up async_queue=%p\n", ctx->ctx_async_queue));
- pfm_do_fasync(-1, filp, ctx, 0);
- }
-
PROTECT_CTX(ctx, flags);
state = ctx->ctx_state;
PROTECT_CTX(ctx, flags);
state = ctx->ctx_state;
@@
-2626,7
+2622,7
@@
pfm_task_incompatible(pfm_context_t *ctx, struct task_struct *task)
/*
* make sure the task is off any CPU
*/
/*
* make sure the task is off any CPU
*/
- wait_task_inactive(task);
+ wait_task_inactive(task
, 0
);
/* more to come... */
/* more to come... */
@@
-3684,7
+3680,7
@@
pfm_restart(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs)
PFM_SET_WORK_PENDING(task, 1);
PFM_SET_WORK_PENDING(task, 1);
-
tsk_
set_notify_resume(task);
+ set_notify_resume(task);
/*
* XXX: send reschedule if task runs on another CPU
/*
* XXX: send reschedule if task runs on another CPU
@@
-4774,7
+4770,7
@@
recheck:
UNPROTECT_CTX(ctx, flags);
UNPROTECT_CTX(ctx, flags);
- wait_task_inactive(task);
+ wait_task_inactive(task
, 0
);
PROTECT_CTX(ctx, flags);
PROTECT_CTX(ctx, flags);
@@
-5044,8
+5040,6
@@
pfm_handle_work(void)
PFM_SET_WORK_PENDING(current, 0);
PFM_SET_WORK_PENDING(current, 0);
- tsk_clear_notify_resume(current);
-
regs = task_pt_regs(current);
/*
regs = task_pt_regs(current);
/*
@@
-5414,7
+5408,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.
*/
* 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
}
/*
* defer until state is changed (shorten spin window). the context is locked