Commit 0fb232fd authored by Hidetoshi Seto's avatar Hidetoshi Seto Committed by Tony Luck

[IA64] trivial cleanup for perfmon.c

Fix a typo, and coding style cleanups for pfm_handle_work().
Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 2e513fe4
...@@ -5013,12 +5013,13 @@ pfm_context_force_terminate(pfm_context_t *ctx, struct pt_regs *regs) ...@@ -5013,12 +5013,13 @@ pfm_context_force_terminate(pfm_context_t *ctx, struct pt_regs *regs)
} }
static int pfm_ovfl_notify_user(pfm_context_t *ctx, unsigned long ovfl_pmds); static int pfm_ovfl_notify_user(pfm_context_t *ctx, unsigned long ovfl_pmds);
/* /*
* pfm_handle_work() can be called with interrupts enabled * pfm_handle_work() can be called with interrupts enabled
* (TIF_NEED_RESCHED) or disabled. The down_interruptible * (TIF_NEED_RESCHED) or disabled. The down_interruptible
* call may sleep, therefore we must re-enable interrupts * call may sleep, therefore we must re-enable interrupts
* to avoid deadlocks. It is safe to do so because this function * to avoid deadlocks. It is safe to do so because this function
* is called ONLY when returning to user level (PUStk=1), in which case * is called ONLY when returning to user level (pUStk=1), in which case
* there is no risk of kernel stack overflow due to deep * there is no risk of kernel stack overflow due to deep
* interrupt nesting. * interrupt nesting.
*/ */
...@@ -5034,7 +5035,8 @@ pfm_handle_work(void) ...@@ -5034,7 +5035,8 @@ pfm_handle_work(void)
ctx = PFM_GET_CTX(current); ctx = PFM_GET_CTX(current);
if (ctx == NULL) { if (ctx == NULL) {
printk(KERN_ERR "perfmon: [%d] has no PFM context\n", task_pid_nr(current)); printk(KERN_ERR "perfmon: [%d] has no PFM context\n",
task_pid_nr(current));
return; return;
} }
...@@ -5058,11 +5060,12 @@ pfm_handle_work(void) ...@@ -5058,11 +5060,12 @@ pfm_handle_work(void)
/* /*
* must be done before we check for simple-reset mode * must be done before we check for simple-reset mode
*/ */
if (ctx->ctx_fl_going_zombie || ctx->ctx_state == PFM_CTX_ZOMBIE) goto do_zombie; if (ctx->ctx_fl_going_zombie || ctx->ctx_state == PFM_CTX_ZOMBIE)
goto do_zombie;
//if (CTX_OVFL_NOBLOCK(ctx)) goto skip_blocking; //if (CTX_OVFL_NOBLOCK(ctx)) goto skip_blocking;
if (reason == PFM_TRAP_REASON_RESET) goto skip_blocking; if (reason == PFM_TRAP_REASON_RESET)
goto skip_blocking;
/* /*
* restore interrupt mask to what it was on entry. * restore interrupt mask to what it was on entry.
...@@ -5110,7 +5113,8 @@ do_zombie: ...@@ -5110,7 +5113,8 @@ do_zombie:
/* /*
* in case of interruption of down() we don't restart anything * in case of interruption of down() we don't restart anything
*/ */
if (ret < 0) goto nothing_to_do; if (ret < 0)
goto nothing_to_do;
skip_blocking: skip_blocking:
pfm_resume_after_ovfl(ctx, ovfl_regs, regs); pfm_resume_after_ovfl(ctx, ovfl_regs, regs);
......
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