aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/perfmon.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-10 03:16:27 -0500
committerIngo Molnar <mingo@elte.hu>2008-11-10 03:16:27 -0500
commit4ecd33d930591d41fe356160593a9076467b961c (patch)
treeb9051a334540bbce38db1b2b03cebb4cf1d51f73 /arch/ia64/kernel/perfmon.c
parent7d5a78cd98c3a5eb83bd6a061c5ea6ef1e9b8fcb (diff)
parentf7160c7573615ec82c691e294cf80d920b5d588d (diff)
Merge commit 'v2.6.28-rc4' into x86/apic
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;