diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-31 08:22:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-31 08:22:12 -0700 |
| commit | c29d85417c5f9a0a970ebd2571b65f0d52f110f5 (patch) | |
| tree | 1a3cb7065d69cbde3927294d91b06b43e4243439 /tools/Makefile | |
| parent | 573efdc5ea953fdbedb9cfe2d2c2f5d23d60ca8f (diff) | |
| parent | bebd024e4815b1a170fcd21ead9c2222b23ce9e6 (diff) | |
| download | linux-c29d85417c5f9a0a970ebd2571b65f0d52f110f5.tar.bz2 | |
Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull CPU hotplug fixes from Thomas Gleixner:
"Two SMT/hotplug related fixes:
- Prevent crash when HOTPLUG_CPU is disabled and the CPU bringup
aborts. This is triggered with the 'nosmt' command line option, but
can happen by any abort condition. As the real unplug code is not
compiled in, prevent the fail by keeping the CPU in zombie state.
- Enforce HOTPLUG_CPU for SMP on x86 to avoid the above situation
completely. With 'nosmt' being a popular option it's required to
unplug the half brought up sibling CPUs (due to the MCE wreckage)
completely"
* 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/smp: Enforce CONFIG_HOTPLUG_CPU when SMP=y
cpu/hotplug: Prevent crash when CPU bringup fails on CONFIG_HOTPLUG_CPU=n
Diffstat (limited to 'tools/Makefile')
0 files changed, 0 insertions, 0 deletions