Merge tag 'platform-drivers-x86-v4.7-2' of git://git.infradead.org/users/dvhart/linux...

[deliverable/linux.git] / drivers / thermal / x86_pkg_temp_thermal.c

diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
index 7fc919f7da4de1878c7617c0eb46e6a7950b06b6..97f0a2bd93edfb64bc326adf29724bf456548ad8 100644 (file)
--- a/drivers/thermal/x86_pkg_temp_thermal.c
+++ b/drivers/thermal/x86_pkg_temp_thermal.c
@@ -555,7 +555,7 @@ static int pkg_temp_thermal_cpu_callback(struct notifier_block *nfb,
 {
        unsigned int cpu = (unsigned long) hcpu;
 
-       switch (action) {
+       switch (action & ~CPU_TASKS_FROZEN) {
        case CPU_ONLINE:
        case CPU_DOWN_FAILED:
                get_core_online(cpu);