Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

notifiers: pm: move pm notifiers into suspend.h

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

Signed-off-by: WANG Cong <amwang@redhat.com>
Cc: David Miller <davem@davemloft.net>
Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Amerigo Wang and committed by
Linus Torvalds
35eb6db1 c5f41752

+11 -8
+1
drivers/mmc/core/core.c
··· 23 23 #include <linux/log2.h> 24 24 #include <linux/regulator/consumer.h> 25 25 #include <linux/pm_runtime.h> 26 + #include <linux/suspend.h> 26 27 27 28 #include <linux/mmc/card.h> 28 29 #include <linux/mmc/host.h>
+2 -8
include/linux/notifier.h
··· 191 191 192 192 /* reboot notifiers are defined in include/linux/reboot.h. */ 193 193 194 - #define NETLINK_URELEASE 0x0001 /* Unicast netlink socket released */ 194 + /* Hibernation and suspend events are defined in include/linux/suspend.h. */ 195 195 196 - /* Hibernation and suspend events */ 197 - #define PM_HIBERNATION_PREPARE 0x0001 /* Going to hibernate */ 198 - #define PM_POST_HIBERNATION 0x0002 /* Hibernation finished */ 199 - #define PM_SUSPEND_PREPARE 0x0003 /* Going to suspend the system */ 200 - #define PM_POST_SUSPEND 0x0004 /* Suspend finished */ 201 - #define PM_RESTORE_PREPARE 0x0005 /* Going to restore a saved image */ 202 - #define PM_POST_RESTORE 0x0006 /* Restore failed */ 196 + #define NETLINK_URELEASE 0x0001 /* Unicast netlink socket released */ 203 197 204 198 /* Console keyboard events. 205 199 * Note: KBD_KEYCODE is always sent before KBD_UNBOUND_KEYCODE, KBD_UNICODE and
+8
include/linux/suspend.h
··· 268 268 static inline bool system_entering_hibernation(void) { return false; } 269 269 #endif /* CONFIG_HIBERNATION */ 270 270 271 + /* Hibernation and suspend events */ 272 + #define PM_HIBERNATION_PREPARE 0x0001 /* Going to hibernate */ 273 + #define PM_POST_HIBERNATION 0x0002 /* Hibernation finished */ 274 + #define PM_SUSPEND_PREPARE 0x0003 /* Going to suspend the system */ 275 + #define PM_POST_SUSPEND 0x0004 /* Suspend finished */ 276 + #define PM_RESTORE_PREPARE 0x0005 /* Going to restore a saved image */ 277 + #define PM_POST_RESTORE 0x0006 /* Restore failed */ 278 + 271 279 #ifdef CONFIG_PM_SLEEP 272 280 void save_processor_state(void); 273 281 void restore_processor_state(void);