| Message ID | 1462179771-55875-1-git-send-email-anna-maria@linutronix.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Anna-Maria Gleixner <anna-maria@linutronix.de> Date: Mon, 2 May 2016 11:02:51 +0200 > 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 > mvneta_percpu_enable() or mvneta_percpu_disable(). The functions do > not require to be called with interrupts disabled, therefore the > smp_call_function_single() calling convention is not preserved. > > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > Cc: netdev@vger.kernel.org > Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> Applied, thanks.
--- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -3354,8 +3354,7 @@ static int mvneta_percpu_notifier(struct /* Enable per-CPU interrupts on the CPU that is * brought up. */ - smp_call_function_single(cpu, mvneta_percpu_enable, - pp, true); + mvneta_percpu_enable(pp); /* Enable per-CPU interrupt on the one CPU we care * about. @@ -3387,8 +3386,7 @@ static int mvneta_percpu_notifier(struct /* Disable per-CPU interrupts on the CPU that is * brought down. */ - smp_call_function_single(cpu, mvneta_percpu_disable, - pp, true); + mvneta_percpu_disable(pp); break; case CPU_DEAD:
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 mvneta_percpu_enable() or mvneta_percpu_disable(). The functions do not require to be called with interrupts disabled, therefore the smp_call_function_single() calling convention is not preserved. Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: netdev@vger.kernel.org Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> --- Changes in v2: - Adapt referenced commit in commit message drivers/net/ethernet/marvell/mvneta.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)