Commit c89072ee authored by Stéphane Eranian's avatar Stéphane Eranian Committed by Tony Luck

[IA64] perfmon.c: fix bug in previous "fix"

- undo the pfm_context_free() call in pfm_handle_work().
  The logic is different. In the case of a controlling
  task exiting while monitored in pfm_handle_work. The
  context is freed in pfm_close() and not pfm_handle_work().
signed-off-by: default avatarstephane eranian <eranian@hpl.hp.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 4b2f85d8
...@@ -5009,7 +5009,7 @@ pfm_handle_work(void) ...@@ -5009,7 +5009,7 @@ pfm_handle_work(void)
unsigned long flags; unsigned long flags;
unsigned long ovfl_regs; unsigned long ovfl_regs;
unsigned int reason; unsigned int reason;
int ret, must_free = 0; int ret;
ctx = PFM_GET_CTX(current); ctx = PFM_GET_CTX(current);
if (ctx == NULL) { if (ctx == NULL) {
...@@ -5087,7 +5087,6 @@ pfm_handle_work(void) ...@@ -5087,7 +5087,6 @@ pfm_handle_work(void)
do_zombie: do_zombie:
DPRINT(("context is zombie, bailing out\n")); DPRINT(("context is zombie, bailing out\n"));
pfm_context_force_terminate(ctx, regs); pfm_context_force_terminate(ctx, regs);
must_free = 1;
goto nothing_to_do; goto nothing_to_do;
} }
/* /*
...@@ -5102,8 +5101,6 @@ pfm_handle_work(void) ...@@ -5102,8 +5101,6 @@ pfm_handle_work(void)
nothing_to_do: nothing_to_do:
UNPROTECT_CTX(ctx, flags); UNPROTECT_CTX(ctx, flags);
if (must_free) pfm_context_free(ctx);
} }
static int static int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment