From 7e4f9ec32f9984e89f7f89370490c41852014e4d Mon Sep 17 00:00:00 2001
From: Amerigo Wang <amwang@redhat.com>
Date: Mon, 25 Jul 2011 17:13:12 -0700
Subject: [PATCH] --- yaml --- r: 259008 b: refs/heads/master c:
 a376d3d6727b2f05ef4c6670cc74afbd8110df89 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/notifier.h | 9 ++-------
 trunk/include/linux/vt.h       | 7 +++++++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index dd5fa6fa6d69..6d91011cb796 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35eb6db11ed9cbf9702ec90a28779a51fe4a21a9
+refs/heads/master: a376d3d6727b2f05ef4c6670cc74afbd8110df89
diff --git a/trunk/include/linux/notifier.h b/trunk/include/linux/notifier.h
index ae8f7d9f8def..d65746efc954 100644
--- a/trunk/include/linux/notifier.h
+++ b/trunk/include/linux/notifier.h
@@ -193,6 +193,8 @@ static inline int notifier_to_errno(int ret)
 
 /* Hibernation and suspend events are defined in include/linux/suspend.h. */
 
+/* Virtual Terminal events are defined in include/linux/vt.h. */
+
 #define NETLINK_URELEASE	0x0001	/* Unicast netlink socket released */
 
 /* Console keyboard events.
@@ -206,12 +208,5 @@ static inline int notifier_to_errno(int ret)
 
 extern struct blocking_notifier_head reboot_notifier_list;
 
-/* Virtual Terminal events. */
-#define VT_ALLOCATE		0x0001 /* Console got allocated */
-#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 */
diff --git a/trunk/include/linux/vt.h b/trunk/include/linux/vt.h
index d5dd0bc408fd..30a8dd9c83ff 100644
--- a/trunk/include/linux/vt.h
+++ b/trunk/include/linux/vt.h
@@ -86,6 +86,13 @@ struct vt_setactivate {
 
 #ifdef __KERNEL__
 
+/* Virtual Terminal events. */
+#define VT_ALLOCATE		0x0001 /* Console got allocated */
+#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 */
+
 #ifdef CONFIG_VT_CONSOLE
 
 extern int vt_kmsg_redirect(int new);