diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-08-11 12:43:50 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-08-11 12:43:50 -0400 |
| commit | 691241315116b962f2161e6190f1678cc65bbe26 (patch) | |
| tree | 2687b0820416b0ebd3c8e45b7bc66d4442b181ed | |
| parent | 1c53e4357ec72d6114c58d20c26d00a904f55da3 (diff) | |
| parent | 6bf11e8c708f0e512ed733fc65a50770c5bc7b54 (diff) | |
pull perfmon context load into release tree
| -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)); |