diff options
| author | Amerigo Wang <amwang@redhat.com> | 2011-07-25 20:13:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 23:57:14 -0400 |
| commit | c5f41752fd37979dbaec61dc59c7ece0606ddf7e (patch) | |
| tree | 47827a7fd86cbe4ad657d640b01e8b76535e8813 /include/linux | |
| parent | dcfe1421c916345b068f43749263b94270324500 (diff) | |
notifiers: sys: move reboot notifiers into reboot.h
It is not necessary to share the same notifier.h.
This patch already moves register_reboot_notifier() and
unregister_reboot_notifier() from kernel/notifier.c to kernel/sys.c.
[amwang@redhat.com: make allyesconfig succeed on ppc64]
Signed-off-by: WANG 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: WANG Cong <amwang@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/notifier.h | 5 | ||||
| -rw-r--r-- | include/linux/reboot.h | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/notifier.h b/include/linux/notifier.h index e8a858a1d391..145c43658db0 100644 --- a/include/linux/notifier.h +++ b/include/linux/notifier.h | |||
| @@ -189,10 +189,7 @@ static inline int notifier_to_errno(int ret) | |||
| 189 | 189 | ||
| 190 | /* netdevice notifiers are defined in include/linux/netdevice.h */ | 190 | /* netdevice notifiers are defined in include/linux/netdevice.h */ |
| 191 | 191 | ||
| 192 | #define SYS_DOWN 0x0001 /* Notify of system down */ | 192 | /* reboot notifiers are defined in include/linux/reboot.h. */ |
| 193 | #define SYS_RESTART SYS_DOWN | ||
| 194 | #define SYS_HALT 0x0002 /* Notify of system halt */ | ||
| 195 | #define SYS_POWER_OFF 0x0003 /* Notify of system power off */ | ||
| 196 | 193 | ||
| 197 | #define NETLINK_URELEASE 0x0001 /* Unicast netlink socket released */ | 194 | #define NETLINK_URELEASE 0x0001 /* Unicast netlink socket released */ |
| 198 | 195 | ||
diff --git a/include/linux/reboot.h b/include/linux/reboot.h index 3005d5a7fce5..e0879a70e830 100644 --- a/include/linux/reboot.h +++ b/include/linux/reboot.h | |||
| @@ -39,6 +39,11 @@ | |||
| 39 | 39 | ||
| 40 | #include <linux/notifier.h> | 40 | #include <linux/notifier.h> |
| 41 | 41 | ||
| 42 | #define SYS_DOWN 0x0001 /* Notify of system down */ | ||
| 43 | #define SYS_RESTART SYS_DOWN | ||
| 44 | #define SYS_HALT 0x0002 /* Notify of system halt */ | ||
| 45 | #define SYS_POWER_OFF 0x0003 /* Notify of system power off */ | ||
| 46 | |||
| 42 | extern int register_reboot_notifier(struct notifier_block *); | 47 | extern int register_reboot_notifier(struct notifier_block *); |
| 43 | extern int unregister_reboot_notifier(struct notifier_block *); | 48 | extern int unregister_reboot_notifier(struct notifier_block *); |
| 44 | 49 | ||
