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

Commit 50a323b7 authored by Tejun Heo's avatar Tejun Heo
Browse files

sched: define and use CPU_PRI_* enums for cpu notifier priorities 



Instead of hardcoding priority 10 and 20 in sched and perf, collect
them into CPU_PRI_* enums.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
parent 3975d167

include/linux/cpu.h

+9 −0
Original line number Diff line number Diff line
@@ -48,6 +48,15 @@ extern ssize_t arch_cpu_release(const char *, size_t); 
#endif

struct notifier_block;



/*

 * CPU notifier priorities.

 */

enum {

	/* migration should happen before other stuff but after perf */

	CPU_PRI_PERF		= 20,

	CPU_PRI_MIGRATION	= 10,

};



#ifdef CONFIG_SMP

/* Need to know about CPUs going up/down? */

#if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE)

include/linux/perf_event.h

+1 −1
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ static inline void perf_event_disable(struct perf_event *event) { } 
#define perf_cpu_notifier(fn)					\

do {								\

	static struct notifier_block fn##_nb __cpuinitdata =	\

		{ .notifier_call = fn, .priority = 20 };	\

		{ .notifier_call = fn, .priority = CPU_PRI_PERF }; \

	fn(&fn##_nb, (unsigned long)CPU_UP_PREPARE,		\

		(void *)(unsigned long)smp_processor_id());	\

	fn(&fn##_nb, (unsigned long)CPU_STARTING,		\

kernel/sched.c

+1 −1
Original line number Diff line number Diff line
@@ -5801,7 +5801,7 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) 
 */

static struct notifier_block __cpuinitdata migration_notifier = {

	.notifier_call = migration_call,

	.priority = 10

	.priority = CPU_PRI_MIGRATION,

};



static int __init migration_init(void)