diff options
author | Anna-Maria Gleixner <anna-maria@linutronix.de> | 2016-05-02 07:49:14 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2016-05-02 16:23:44 -0400 |
commit | e298c499cac1f175694f4ccfe5b532e5098b4716 (patch) | |
tree | a6bd1a7dcfc771e52054f90a6d91e049b36e2ed2 | |
parent | 04974df8049fc4240d22759a91e035082ccd18b4 (diff) |
ia64: Remove superfluous SMP function call
Since commit 3b9d6da67e11 ("cpu/hotplug: Fix rollback during error-out
in __cpu_disable()") it is ensured that callbacks of CPU_ONLINE and
CPU_DOWN_PREPARE are processed on the hotplugged CPU. Due to this SMP
function calls are no longer required.
Replace smp_call_function_single() with a direct call to
ia64_mca_cmc_vector_adjust(). The function itselfs handles disable and
enable interrupts, therefore the smp_call_function_single() calling
convention is not preserved.
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64@vger.kernel.org
Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r-- | arch/ia64/kernel/mca.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index 2889412e03eb..07a4e32ae96a 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c | |||
@@ -1904,13 +1904,10 @@ static int mca_cpu_callback(struct notifier_block *nfb, | |||
1904 | unsigned long action, | 1904 | unsigned long action, |
1905 | void *hcpu) | 1905 | void *hcpu) |
1906 | { | 1906 | { |
1907 | int hotcpu = (unsigned long) hcpu; | ||
1908 | |||
1909 | switch (action) { | 1907 | switch (action) { |
1910 | case CPU_ONLINE: | 1908 | case CPU_ONLINE: |
1911 | case CPU_ONLINE_FROZEN: | 1909 | case CPU_ONLINE_FROZEN: |
1912 | smp_call_function_single(hotcpu, ia64_mca_cmc_vector_adjust, | 1910 | ia64_mca_cmc_vector_adjust(NULL); |
1913 | NULL, 0); | ||
1914 | break; | 1911 | break; |
1915 | } | 1912 | } |
1916 | return NOTIFY_OK; | 1913 | return NOTIFY_OK; |