Merge branch 'x86/amd-nb' into x86/apic-cleanups

Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform

Conflicts:
	arch/x86/include/asm/io_apic.h

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index ca142c47b2e4..94255f09093d 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -678,7 +678,14 @@ static int netconsole_netdev_event(struct notifier_block *this,
                                 strlcpy(nt->np.dev_name, dev->name, IFNAMSIZ);
                                 break;
                         case NETDEV_UNREGISTER:
-                                netpoll_cleanup(&nt->np);
+                                /*
+                                 * rtnl_lock already held
+                                 */
+                                if (nt->np.dev) {
+                                        __netpoll_cleanup(&nt->np);
+                                        dev_put(nt->np.dev);
+                                        nt->np.dev = NULL;
+                                }
                                 /* Fall through */
                         case NETDEV_GOING_DOWN:
                         case NETDEV_BONDING_DESLAVE: