diff options
| author |   Tony Luck <tony.luck@intel.com> | 2011-08-11 09:27:54 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2011-08-11 09:27:54 -0700 |
| commit | d5d4e02874537d65ed2f431d39bf2f6d2967bd1b (patch) | |
| tree | 78844825f801f1d8476ce512ff9772ec46e7c1a0 /arch/ia64/sn | |
| parent | Linux 3.1-rc1 (diff) | |
| download | linux-dev-d5d4e02874537d65ed2f431d39bf2f6d2967bd1b.tar.xz linux-dev-d5d4e02874537d65ed2f431d39bf2f6d2967bd1b.zip | |
[IA64] sn2: add missing put_cpu()
sn_hwperf_op_cpu() uses get_cpu() but is missing a corresponding put_cpu().
Reported-by: Thomas Meyer <thomas@m3y3r.de>
Acked-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/sn')
| -rw-r--r-- | arch/ia64/sn/kernel/sn2/sn_hwperf.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c index 30862c0358cd..2de41d44266e 100644 --- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c +++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c @@ -615,11 +615,15 @@ static int sn_hwperf_op_cpu(struct sn_hwperf_op_info *op_info) } } - if (cpu == SN_HWPERF_ARG_ANY_CPU || cpu == get_cpu()) { - /* don't care, or already on correct cpu */ + if (cpu == SN_HWPERF_ARG_ANY_CPU) { + /* don't care which cpu */ sn_hwperf_call_sal(op_info); - } - else { + } else if (cpu == get_cpu()) { + /* already on correct cpu */ + sn_hwperf_call_sal(op_info); + put_cpu(); + } else { + put_cpu(); if (use_ipi) { /* use an interprocessor interrupt to call SAL */ smp_call_function_single(cpu, sn_hwperf_call_sal, |