← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to arch/ia64/sn/kernel/sn2/sn_hwperf.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/ia64/sn/kernel/sn2/sn_hwperf.c
615
615
                }
616
616
        }
617
617
 
618
 
        if (cpu == SN_HWPERF_ARG_ANY_CPU || cpu == get_cpu()) {
619
 
                /* don't care, or already on correct cpu */
620
 
                sn_hwperf_call_sal(op_info);
621
 
        }
622
 
        else {
 
618
        if (cpu == SN_HWPERF_ARG_ANY_CPU) {
 
619
                /* don't care which cpu */
 
620
                sn_hwperf_call_sal(op_info);
 
621
        } else if (cpu == get_cpu()) {
 
622
                /* already on correct cpu */
 
623
                sn_hwperf_call_sal(op_info);
 
624
                put_cpu();
 
625
        } else {
 
626
                put_cpu();
623
627
                if (use_ipi) {
624
628
                        /* use an interprocessor interrupt to call SAL */
625
629
                        smp_call_function_single(cpu, sn_hwperf_call_sal,