aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmerigo Wang <amwang@redhat.com>2011-07-25 20:13:12 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-25 23:57:15 -0400
commita376d3d6727b2f05ef4c6670cc74afbd8110df89 (patch)
tree7c2755460389011296da7c41830319ad8673dea4
parent35eb6db11ed9cbf9702ec90a28779a51fe4a21a9 (diff)
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>
-rw-r--r--include/linux/notifier.h9
-rw-r--r--include/linux/vt.h7
2 files changed, 9 insertions, 7 deletions
diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index ae8f7d9f8def..d65746efc954 100644
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
@@ -193,6 +193,8 @@ static inline int notifier_to_errno(int ret)
193 193
194/* Hibernation and suspend events are defined in include/linux/suspend.h. */ 194/* Hibernation and suspend events are defined in include/linux/suspend.h. */
195 195
196/* Virtual Terminal events are defined in include/linux/vt.h. */
197
196#define NETLINK_URELEASE 0x0001 /* Unicast netlink socket released */ 198#define NETLINK_URELEASE 0x0001 /* Unicast netlink socket released */
197 199
198/* Console keyboard events. 200/* Console keyboard events.
@@ -206,12 +208,5 @@ static inline int notifier_to_errno(int ret)
206 208
207extern struct blocking_notifier_head reboot_notifier_list; 209extern struct blocking_notifier_head reboot_notifier_list;
208 210
209/* Virtual Terminal events. */
210#define VT_ALLOCATE 0x0001 /* Console got allocated */
211#define VT_DEALLOCATE 0x0002 /* Console will be deallocated */
212#define VT_WRITE 0x0003 /* A char got output */
213#define VT_UPDATE 0x0004 /* A bigger update occurred */
214#define VT_PREWRITE 0x0005 /* A char is about to be written to the console */
215
216#endif /* __KERNEL__ */ 211#endif /* __KERNEL__ */
217#endif /* _LINUX_NOTIFIER_H */ 212#endif /* _LINUX_NOTIFIER_H */
diff --git a/include/linux/vt.h b/include/linux/vt.h
index d5dd0bc408fd..30a8dd9c83ff 100644
--- a/include/linux/vt.h
+++ b/include/linux/vt.h
@@ -86,6 +86,13 @@ struct vt_setactivate {
86 86
87#ifdef __KERNEL__ 87#ifdef __KERNEL__
88 88
89/* Virtual Terminal events. */
90#define VT_ALLOCATE 0x0001 /* Console got allocated */
91#define VT_DEALLOCATE 0x0002 /* Console will be deallocated */
92#define VT_WRITE 0x0003 /* A char got output */
93#define VT_UPDATE 0x0004 /* A bigger update occurred */
94#define VT_PREWRITE 0x0005 /* A char is about to be written to the console */
95
89#ifdef CONFIG_VT_CONSOLE 96#ifdef CONFIG_VT_CONSOLE
90 97
91extern int vt_kmsg_redirect(int new); 98extern int vt_kmsg_redirect(int new);