diff options
Diffstat (limited to 'kernel/cpu.c')
| -rw-r--r-- | kernel/cpu.c | 6 | 
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 8de11a29e495..d851df22f5c5 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -24,6 +24,7 @@  #include <linux/lockdep.h>  #include <linux/tick.h>  #include <linux/irq.h> +#include <linux/nmi.h>  #include <linux/smpboot.h>  #include <linux/relay.h>  #include <linux/slab.h> @@ -897,6 +898,11 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,  out:  	cpus_write_unlock(); +	/* +	 * Do post unplug cleanup. This is still protected against +	 * concurrent CPU hotplug via cpu_add_remove_lock. +	 */ +	lockup_detector_cleanup();  	return ret;  }  | 
