Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6] / include / linux / notifier.h

diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index 5dfbc684ce7daab792ca9ddf40e842fe5a5cc1c7..20dfed590183cb0d0ad94998cfde168fdc7e97b3 100644 (file)
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
@@ -228,6 +228,8 @@ static inline int notifier_to_errno(int ret)
 #define PM_POST_HIBERNATION    0x0002 /* Hibernation finished */
 #define PM_SUSPEND_PREPARE     0x0003 /* Going to suspend the system */
 #define PM_POST_SUSPEND                0x0004 /* Suspend finished */
+#define PM_RESTORE_PREPARE     0x0005 /* Going to restore a saved image */
+#define PM_POST_RESTORE                0x0006 /* Restore failed */
 
 /* Console keyboard events.
  * Note: KBD_KEYCODE is always sent before KBD_UNBOUND_KEYCODE, KBD_UNICODE and
@@ -245,6 +247,7 @@ extern struct blocking_notifier_head reboot_notifier_list;
 #define VT_DEALLOCATE          0x0002 /* Console will be deallocated */
 #define VT_WRITE               0x0003 /* A char got output */
 #define VT_UPDATE              0x0004 /* A bigger update occurred */
+#define VT_PREWRITE            0x0005 /* A char is about to be written to the console */
 
 #endif /* __KERNEL__ */
 #endif /* _LINUX_NOTIFIER_H */