Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a376d3d6 authored by Amerigo Wang's avatar Amerigo Wang Committed by Linus Torvalds
Browse files

notifiers: vt: move vt notifiers into vt.h 



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

Signed-off-by: default avatarWANG 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 35eb6db1

include/linux/notifier.h

+2 −7
Original line number Original line Diff line number Diff line
@@ -193,6 +193,8 @@ static inline int notifier_to_errno(int ret) 




/* Hibernation and suspend events are defined in include/linux/suspend.h. */

/* 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 */

#define NETLINK_URELEASE	0x0001	/* Unicast netlink socket released */





/* Console keyboard events.

/* Console keyboard events.
@@ -206,12 +208,5 @@ static inline int notifier_to_errno(int ret) 




extern struct blocking_notifier_head reboot_notifier_list;

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 /* __KERNEL__ */

#endif /* _LINUX_NOTIFIER_H */
 
#endif /* _LINUX_NOTIFIER_H */

include/linux/vt.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -86,6 +86,13 @@ struct vt_setactivate { 




#ifdef __KERNEL__

#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

#ifdef CONFIG_VT_CONSOLE





extern int vt_kmsg_redirect(int new);

extern int vt_kmsg_redirect(int new);