UAPI: (Scripted) Disintegrate include/linux

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>

1 files changed, 1 insertions, 87 deletions

diff --git a/include/linux/vt.h b/include/linux/vt.h
index 30a8dd9c83ff..b186e0435239 100644
--- a/include/linux/vt.h
+++ b/include/linux/vt.h
@@ -1,90 +1,8 @@
 #ifndef _LINUX_VT_H
 #define _LINUX_VT_H
 
+#include <uapi/linux/vt.h>
 
-/*
- * These constants are also useful for user-level apps (e.g., VC
- * resizing).
- */
-#define MIN_NR_CONSOLES 1       /* must be at least 1 */
-#define MAX_NR_CONSOLES 63      /* serial lines start at 64 */
-#define MAX_NR_USER_CONSOLES 63 /* must be root to allocate above this */
-                /* Note: the ioctl VT_GETSTATE does not work for
-                   consoles 16 and higher (since it returns a short) */
-
-/* 0x56 is 'V', to avoid collision with termios and kd */
-
-#define VT_OPENQRY      0x5600  /* find available vt */
-
-struct vt_mode {
-        char mode;              /* vt mode */
-        char waitv;             /* if set, hang on writes if not active */
-        short relsig;           /* signal to raise on release req */
-        short acqsig;           /* signal to raise on acquisition */
-        short frsig;            /* unused (set to 0) */
-};
-#define VT_GETMODE      0x5601  /* get mode of active vt */
-#define VT_SETMODE      0x5602  /* set mode of active vt */
-#define         VT_AUTO         0x00    /* auto vt switching */
-#define         VT_PROCESS      0x01    /* process controls switching */
-#define         VT_ACKACQ       0x02    /* acknowledge switch */
-
-struct vt_stat {
-        unsigned short v_active;        /* active vt */
-        unsigned short v_signal;        /* signal to send */
-        unsigned short v_state;         /* vt bitmask */
-};
-#define VT_GETSTATE     0x5603  /* get global vt state info */
-#define VT_SENDSIG      0x5604  /* signal to send to bitmask of vts */
-
-#define VT_RELDISP      0x5605  /* release display */
-
-#define VT_ACTIVATE     0x5606  /* make vt active */
-#define VT_WAITACTIVE   0x5607  /* wait for vt active */
-#define VT_DISALLOCATE  0x5608  /* free memory associated to vt */
-
-struct vt_sizes {
-        unsigned short v_rows;          /* number of rows */
-        unsigned short v_cols;          /* number of columns */
-        unsigned short v_scrollsize;    /* number of lines of scrollback */
-};
-#define VT_RESIZE       0x5609  /* set kernel's idea of screensize */
-
-struct vt_consize {
-        unsigned short v_rows;  /* number of rows */
-        unsigned short v_cols;  /* number of columns */
-        unsigned short v_vlin;  /* number of pixel rows on screen */
-        unsigned short v_clin;  /* number of pixel rows per character */
-        unsigned short v_vcol;  /* number of pixel columns on screen */
-        unsigned short v_ccol;  /* number of pixel columns per character */
-};
-#define VT_RESIZEX      0x560A  /* set kernel's idea of screensize + more */
-#define VT_LOCKSWITCH   0x560B  /* disallow vt switching */
-#define VT_UNLOCKSWITCH 0x560C  /* allow vt switching */
-#define VT_GETHIFONTMASK 0x560D  /* return hi font mask */
-
-struct vt_event {
-        unsigned int event;
-#define VT_EVENT_SWITCH         0x0001  /* Console switch */
-#define VT_EVENT_BLANK          0x0002  /* Screen blank */
-#define VT_EVENT_UNBLANK        0x0004  /* Screen unblank */
-#define VT_EVENT_RESIZE         0x0008  /* Resize display */
-#define VT_MAX_EVENT            0x000F
-        unsigned int oldev;             /* Old console */
-        unsigned int newev;             /* New console (if changing) */
-        unsigned int pad[4];            /* Padding for expansion */
-};
-
-#define VT_WAITEVENT    0x560E  /* Wait for an event */
-
-struct vt_setactivate {
-        unsigned int console;
-        struct vt_mode mode;
-};
-
-#define VT_SETACTIVATE  0x560F  /* Activate and set the mode of a console */
-
-#ifdef __KERNEL__
 
 /* Virtual Terminal events. */
 #define VT_ALLOCATE             0x0001 /* Console got allocated */
@@ -106,8 +24,4 @@ static inline int vt_kmsg_redirect(int new)
 
 #endif
 
-#endif /* __KERNEL__ */
-
-#define vt_get_kmsg_redirect() vt_kmsg_redirect(-1)
-
 #endif /* _LINUX_VT_H */