notifiers: vt: move vt notifiers into vt.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>
Cc: "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>

diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index ae8f7d9f8deffd7450ba3a0ece283aed05c66db0..d65746efc954c9b4f396a1bcf6561203de265fc9 100644 (file)
--- a/include/linux/notifier.h
+++ b/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/include/linux/vt.h b/include/linux/vt.h
index d5dd0bc408fd4e7b1e79ea8326841a8a187f2738..30a8dd9c83ffe7285ed92054a280b685220d87e8 100644 (file)
--- a/include/linux/vt.h
+++ b/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);