Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec30f343 authored by Shaohua Li's avatar Shaohua Li Committed by Linus Torvalds
Browse files

fix a shutdown regression in intel_idle 



Fix a shutdown regression caused by 2a2d31c8 ("intel_idle: open
broadcast clock event").  The clockevent framework can automatically
shutdown broadcast timers for hotremove CPUs.  And we get a shutdown
regression when we shutdown broadcast timer for hot remove CPU, so just
delete some code.

Also fix some section mismatch.

Reported-by: default avatarAri Savolainen <ari.m.savolainen@gmail.com>
Signed-off-by: default avatarShaohua Li <shaohua.li@intel.com>
Tested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Cc: stable@kernel.org
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 34686fe6

drivers/idle/intel_idle.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -263,7 +263,7 @@ static void __setup_broadcast_timer(void *arg) 
	clockevents_notify(reason, &cpu);

	clockevents_notify(reason, &cpu);

}

}





static int __cpuinit setup_broadcast_cpuhp_notify(struct notifier_block *n,

static int setup_broadcast_cpuhp_notify(struct notifier_block *n,

		unsigned long action, void *hcpu)

		unsigned long action, void *hcpu)

{

{

	int hotcpu = (unsigned long)hcpu;

	int hotcpu = (unsigned long)hcpu;
@@ -273,15 +273,11 @@ static int __cpuinit setup_broadcast_cpuhp_notify(struct notifier_block *n, 
		smp_call_function_single(hotcpu, __setup_broadcast_timer,

		smp_call_function_single(hotcpu, __setup_broadcast_timer,

			(void *)true, 1);

			(void *)true, 1);

		break;

		break;

	case CPU_DOWN_PREPARE:

		smp_call_function_single(hotcpu, __setup_broadcast_timer,

			(void *)false, 1);

		break;

	}

	}

	return NOTIFY_OK;

	return NOTIFY_OK;

}

}





static struct notifier_block __cpuinitdata setup_broadcast_notifier = {

static struct notifier_block setup_broadcast_notifier = {

	.notifier_call = setup_broadcast_cpuhp_notify,

	.notifier_call = setup_broadcast_cpuhp_notify,

};

};