aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/perfmon.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-23 02:55:47 -0500
committerIngo Molnar <mingo@elte.hu>2008-11-23 02:55:47 -0500
commitca9eed76133c00e7f4b1eeb4c1a6cb800cd2654c (patch)
tree5f011f4bd00c921e41605b1915c227aeaf411a0d /arch/ia64/kernel/perfmon.c
parent8652cb4b0d87accbe78725fd2a13be2787059649 (diff)
parent13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff)
Merge commit 'v2.6.28-rc6' into x86/debug
Diffstat (limited to 'arch/ia64/kernel/perfmon.c')
-rw-r--r--arch/ia64/kernel/perfmon.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index ada4605d1223..6543a5547c84 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -1995,11 +1995,6 @@ pfm_close(struct inode *inode, struct file *filp)
1995 return -EBADF; 1995 return -EBADF;
1996 } 1996 }
1997 1997
1998 if (filp->f_flags & FASYNC) {
1999 DPRINT(("cleaning up async_queue=%p\n", ctx->ctx_async_queue));
2000 pfm_do_fasync(-1, filp, ctx, 0);
2001 }
2002
2003 PROTECT_CTX(ctx, flags); 1998 PROTECT_CTX(ctx, flags);
2004 1999
2005 state = ctx->ctx_state; 2000 state = ctx->ctx_state;