diff options
| author | David S. Miller | 2016-10-22 22:17:54 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-10-22 22:17:54 +0200 |
| commit | 860e0217fcc9c52013d2dde0b5953fdc95276fc1 (patch) | |
| tree | 46054ef8f49526b1744873ae61ce82e31eb6ba37 | |
| parent | netns: revert "netns: avoid disabling irq for netns id" (diff) | |
| parent | net: dsa: bcm_sf2: Do not rely on kexec_in_progress (diff) | |
| download | kernel-qcow2-linux-860e0217fcc9c52013d2dde0b5953fdc95276fc1.tar.gz kernel-qcow2-linux-860e0217fcc9c52013d2dde0b5953fdc95276fc1.tar.xz kernel-qcow2-linux-860e0217fcc9c52013d2dde0b5953fdc95276fc1.zip | |
Merge branch 'dsa-bcm_sf2-do-not-rely-on-kexec_in_progress'
Florian Fainelli says:
====================
net: dsa: bcm_sf2: Do not rely on kexec_in_progress
These are the two patches following the discussing we had on kexec_in_progress.
Feel free to apply or discard them, thanks!
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/dsa/bcm_sf2.c | 5 | ||||
| -rw-r--r-- | kernel/kexec_core.c | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index 077a24541584..e3ee27ce13dd 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -30,7 +30,6 @@ #include <linux/etherdevice.h> #include <net/switchdev.h> #include <linux/platform_data/b53.h> -#include <linux/kexec.h> #include "bcm_sf2.h" #include "bcm_sf2_regs.h" @@ -1141,9 +1140,11 @@ static void bcm_sf2_sw_shutdown(struct platform_device *pdev) /* For a kernel about to be kexec'd we want to keep the GPHY on for a * successful MDIO bus scan to occur. If we did turn off the GPHY * before (e.g: port_disable), this will also power it back on. + * + * Do not rely on kexec_in_progress, just power the PHY on. */ if (priv->hw_params.num_gphy == 1) - bcm_sf2_gphy_enable_set(priv->dev->ds, kexec_in_progress); + bcm_sf2_gphy_enable_set(priv->dev->ds, true); } #ifdef CONFIG_PM_SLEEP diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index 786ab85a5452..561675589511 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -59,7 +59,6 @@ size_t vmcoreinfo_max_size = sizeof(vmcoreinfo_data); /* Flag to indicate we are going to kexec a new kernel */ bool kexec_in_progress = false; -EXPORT_SYMBOL_GPL(kexec_in_progress); /* Location of the reserved area for the crash kernel */ |