diff options
| author | Tony Luck <tony.luck@intel.com> | 2010-02-26 15:04:32 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2010-02-26 15:04:32 -0500 |
| commit | 4d86e1b18d6de8446aa424b615b34e436d42c241 (patch) | |
| tree | 862029bb99edc8809161acaf748c7b606cc02a7b /arch/ia64/kernel | |
| parent | 65c9bb6cca78a3677c66c6b279d5d77aa863bb32 (diff) | |
| parent | b6dcefdef49000fc871a851cba4b48454343cde5 (diff) | |
Pull misc2634 into release branch
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/perfmon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 6bcbe215b9a4..b81e46b1629b 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
| @@ -2713,7 +2713,7 @@ pfm_context_create(pfm_context_t *ctx, void *arg, int count, struct pt_regs *reg | |||
| 2713 | goto buffer_error; | 2713 | goto buffer_error; |
| 2714 | } | 2714 | } |
| 2715 | 2715 | ||
| 2716 | DPRINT(("ctx=%p flags=0x%x system=%d notify_block=%d excl_idle=%d no_msg=%d ctx_fd=%d \n", | 2716 | DPRINT(("ctx=%p flags=0x%x system=%d notify_block=%d excl_idle=%d no_msg=%d ctx_fd=%d\n", |
| 2717 | ctx, | 2717 | ctx, |
| 2718 | ctx_flags, | 2718 | ctx_flags, |
| 2719 | ctx->ctx_fl_system, | 2719 | ctx->ctx_fl_system, |
| @@ -3677,7 +3677,7 @@ pfm_restart(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs) | |||
| 3677 | * "self-monitoring". | 3677 | * "self-monitoring". |
| 3678 | */ | 3678 | */ |
| 3679 | if (CTX_OVFL_NOBLOCK(ctx) == 0 && state == PFM_CTX_MASKED) { | 3679 | if (CTX_OVFL_NOBLOCK(ctx) == 0 && state == PFM_CTX_MASKED) { |
| 3680 | DPRINT(("unblocking [%d] \n", task_pid_nr(task))); | 3680 | DPRINT(("unblocking [%d]\n", task_pid_nr(task))); |
| 3681 | complete(&ctx->ctx_restart_done); | 3681 | complete(&ctx->ctx_restart_done); |
| 3682 | } else { | 3682 | } else { |
| 3683 | DPRINT(("[%d] armed exit trap\n", task_pid_nr(task))); | 3683 | DPRINT(("[%d] armed exit trap\n", task_pid_nr(task))); |