pull perfmon context load into release tree
authorTony Luck <tony.luck@intel.com>
Thu, 11 Aug 2005 16:43:50 +0000 (09:43 -0700)
committerTony Luck <tony.luck@intel.com>
Thu, 11 Aug 2005 16:43:50 +0000 (09:43 -0700)
arch/ia64/kernel/perfmon.c

index b8ebb8e427efad319ddecadcee632b9c037eb56a..f1201ac8a11617b012ec9e8a25c1b6cf20863d80 100644 (file)
@@ -4312,6 +4312,7 @@ pfm_context_load(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs)
        DPRINT(("before cmpxchg() old_ctx=%p new_ctx=%p\n",
                thread->pfm_context, ctx));
 
+       ret = -EBUSY;
        old = ia64_cmpxchg(acq, &thread->pfm_context, NULL, ctx, sizeof(pfm_context_t *));
        if (old != NULL) {
                DPRINT(("load_pid [%d] already has a context\n", req->load_pid));