diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-17 16:08:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-17 16:08:17 -0400 |
| commit | d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b (patch) | |
| tree | 7887d95ec36087946a2c4b4c9ee0850c361fe22f /arch/ia64/kernel/perfmon.c | |
| parent | c231c7db30faf93419fc22d680f74d816bea70e2 (diff) | |
| parent | c149ec05dcd09d525e6778e339122827c7cd79b8 (diff) | |
Merge head 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/kernel/perfmon.c')
| -rw-r--r-- | arch/ia64/kernel/perfmon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index b8ebb8e427ef..f1201ac8a116 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
| @@ -4312,6 +4312,7 @@ pfm_context_load(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs) | |||
| 4312 | DPRINT(("before cmpxchg() old_ctx=%p new_ctx=%p\n", | 4312 | DPRINT(("before cmpxchg() old_ctx=%p new_ctx=%p\n", |
| 4313 | thread->pfm_context, ctx)); | 4313 | thread->pfm_context, ctx)); |
| 4314 | 4314 | ||
| 4315 | ret = -EBUSY; | ||
| 4315 | old = ia64_cmpxchg(acq, &thread->pfm_context, NULL, ctx, sizeof(pfm_context_t *)); | 4316 | old = ia64_cmpxchg(acq, &thread->pfm_context, NULL, ctx, sizeof(pfm_context_t *)); |
| 4316 | if (old != NULL) { | 4317 | if (old != NULL) { |
| 4317 | DPRINT(("load_pid [%d] already has a context\n", req->load_pid)); | 4318 | DPRINT(("load_pid [%d] already has a context\n", req->load_pid)); |