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

Commit 80f1ff97 authored by Amerigo Wang's avatar Amerigo Wang Committed by Linus Torvalds
Browse files

notifiers: cpu: move cpu notifiers into cpu.h 



We presently define all kinds of notifiers in notifier.h.  This is not
necessary at all, since different subsystems use different notifiers, they
are almost non-related with each other.

This can also save much build time.  Suppose I add a new netdevice event,
really I don't have to recompile all the source, just network related.
Without this patch, all the source will be recompiled.

I move the notify events near to their subsystem notifier registers, so
that they can be found more easily.

This patch:

It is not necessary to share the same notifier.h.

Signed-off-by: default avatarWANG Cong <amwang@redhat.com>
Cc: David Miller <davem@davemloft.net>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a1bb73d7

include/linux/cpu.h

+33 −0
Original line number Diff line number Diff line
@@ -70,6 +70,39 @@ enum { 
	CPU_PRI_WORKQUEUE	= 5,

};



#define CPU_ONLINE		0x0002 /* CPU (unsigned)v is up */

#define CPU_UP_PREPARE		0x0003 /* CPU (unsigned)v coming up */

#define CPU_UP_CANCELED		0x0004 /* CPU (unsigned)v NOT coming up */

#define CPU_DOWN_PREPARE	0x0005 /* CPU (unsigned)v going down */

#define CPU_DOWN_FAILED		0x0006 /* CPU (unsigned)v NOT going down */

#define CPU_DEAD		0x0007 /* CPU (unsigned)v dead */

#define CPU_DYING		0x0008 /* CPU (unsigned)v not running any task,

					* not handling interrupts, soon dead.

					* Called on the dying cpu, interrupts

					* are already disabled. Must not

					* sleep, must not fail */

#define CPU_POST_DEAD		0x0009 /* CPU (unsigned)v dead, cpu_hotplug

					* lock is dropped */

#define CPU_STARTING		0x000A /* CPU (unsigned)v soon running.

					* Called on the new cpu, just before

					* enabling interrupts. Must not sleep,

					* must not fail */



/* Used for CPU hotplug events occurring while tasks are frozen due to a suspend

 * operation in progress

 */

#define CPU_TASKS_FROZEN	0x0010



#define CPU_ONLINE_FROZEN	(CPU_ONLINE | CPU_TASKS_FROZEN)

#define CPU_UP_PREPARE_FROZEN	(CPU_UP_PREPARE | CPU_TASKS_FROZEN)

#define CPU_UP_CANCELED_FROZEN	(CPU_UP_CANCELED | CPU_TASKS_FROZEN)

#define CPU_DOWN_PREPARE_FROZEN	(CPU_DOWN_PREPARE | CPU_TASKS_FROZEN)

#define CPU_DOWN_FAILED_FROZEN	(CPU_DOWN_FAILED | CPU_TASKS_FROZEN)

#define CPU_DEAD_FROZEN		(CPU_DEAD | CPU_TASKS_FROZEN)

#define CPU_DYING_FROZEN	(CPU_DYING | CPU_TASKS_FROZEN)

#define CPU_STARTING_FROZEN	(CPU_STARTING | CPU_TASKS_FROZEN)





#ifdef CONFIG_SMP

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

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

include/linux/notifier.h

+2 −32
Original line number Diff line number Diff line
@@ -185,6 +185,8 @@ static inline int notifier_to_errno(int ret) 
 *	VC switch chains (for loadable kernel svgalib VC switch helpers) etc...

 */

 

/* CPU notfiers are defined in include/linux/cpu.h. */



/* netdevice notifier chain. Please remember to update the rtnetlink

 * notification exclusion list in rtnetlink_event() when adding new

 * types.
@@ -220,38 +222,6 @@ static inline int notifier_to_errno(int ret) 


#define NETLINK_URELEASE	0x0001	/* Unicast netlink socket released */



#define CPU_ONLINE		0x0002 /* CPU (unsigned)v is up */

#define CPU_UP_PREPARE		0x0003 /* CPU (unsigned)v coming up */

#define CPU_UP_CANCELED		0x0004 /* CPU (unsigned)v NOT coming up */

#define CPU_DOWN_PREPARE	0x0005 /* CPU (unsigned)v going down */

#define CPU_DOWN_FAILED		0x0006 /* CPU (unsigned)v NOT going down */

#define CPU_DEAD		0x0007 /* CPU (unsigned)v dead */

#define CPU_DYING		0x0008 /* CPU (unsigned)v not running any task,

					* not handling interrupts, soon dead.

					* Called on the dying cpu, interrupts

					* are already disabled. Must not

					* sleep, must not fail */

#define CPU_POST_DEAD		0x0009 /* CPU (unsigned)v dead, cpu_hotplug

					* lock is dropped */

#define CPU_STARTING		0x000A /* CPU (unsigned)v soon running.

					* Called on the new cpu, just before

					* enabling interrupts. Must not sleep,

					* must not fail */



/* Used for CPU hotplug events occurring while tasks are frozen due to a suspend

 * operation in progress

 */

#define CPU_TASKS_FROZEN	0x0010



#define CPU_ONLINE_FROZEN	(CPU_ONLINE | CPU_TASKS_FROZEN)

#define CPU_UP_PREPARE_FROZEN	(CPU_UP_PREPARE | CPU_TASKS_FROZEN)

#define CPU_UP_CANCELED_FROZEN	(CPU_UP_CANCELED | CPU_TASKS_FROZEN)

#define CPU_DOWN_PREPARE_FROZEN	(CPU_DOWN_PREPARE | CPU_TASKS_FROZEN)

#define CPU_DOWN_FAILED_FROZEN	(CPU_DOWN_FAILED | CPU_TASKS_FROZEN)

#define CPU_DEAD_FROZEN		(CPU_DEAD | CPU_TASKS_FROZEN)

#define CPU_DYING_FROZEN	(CPU_DYING | CPU_TASKS_FROZEN)

#define CPU_STARTING_FROZEN	(CPU_STARTING | CPU_TASKS_FROZEN)



/* Hibernation and suspend events */

#define PM_HIBERNATION_PREPARE	0x0001 /* Going to hibernate */

#define PM_POST_HIBERNATION	0x0002 /* Hibernation finished */

net/rds/page.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
 */

#include <linux/highmem.h>

#include <linux/gfp.h>

#include <linux/cpu.h>



#include "rds.h"