Revert "tty: vt: use _IO() to define ioctl numbers"

This reverts commit f1180ca37abe3d117e4a19be12142fe722612a7c. Since the
commit, the vt ioctl numbers are defined differently on platforms where
_IOC_NONE is non-zero: alpha, mips, powerpc, sparc.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Reported-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Link: https://lore.kernel.org/all/436489B9-E67B-4630-909F-386C30A2AAC9@xenosoft.de/
Link: https://lore.kernel.org/all/97ec2636-915a-498c-903b-d66957420d21@csgroup.eu/
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20250801082613.2564584-1-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jiri Slaby (SUSE) and committed by

Greg Kroah-Hartman 10 months ago 55a98492 89748acd

+17 -17

1 changed file

expand all

include

uapi

linux

vt.h

+17 -17

include/uapi/linux/vt.h

··· 14 14 /* Note: the ioctl VT_GETSTATE does not work for 15 15 consoles 16 and higher (since it returns a short) */ 16 16 17 - /* 'V' to avoid collision with termios and kd */ 17 + /* 0x56 is 'V', to avoid collision with termios and kd */ 18 18 19 - #define VT_OPENQRY _IO('V', 0x00) /* find available vt */ 19 + #define VT_OPENQRY 0x5600 /* find available vt */ 20 20 21 21 struct vt_mode { 22 22 __u8 mode; /* vt mode */ ··· 25 25 __s16 acqsig; /* signal to raise on acquisition */ 26 26 __s16 frsig; /* unused (set to 0) */ 27 27 }; 28 - #define VT_GETMODE _IO('V', 0x01) /* get mode of active vt */ 29 - #define VT_SETMODE _IO('V', 0x02) /* set mode of active vt */ 28 + #define VT_GETMODE 0x5601 /* get mode of active vt */ 29 + #define VT_SETMODE 0x5602 /* set mode of active vt */ 30 30 #define VT_AUTO 0x00 /* auto vt switching */ 31 31 #define VT_PROCESS 0x01 /* process controls switching */ 32 32 #define VT_ACKACQ 0x02 /* acknowledge switch */ ··· 36 36 __u16 v_signal; /* signal to send */ 37 37 __u16 v_state; /* vt bitmask */ 38 38 }; 39 - #define VT_GETSTATE _IO('V', 0x03) /* get global vt state info */ 40 - #define VT_SENDSIG _IO('V', 0x04) /* signal to send to bitmask of vts */ 39 + #define VT_GETSTATE 0x5603 /* get global vt state info */ 40 + #define VT_SENDSIG 0x5604 /* signal to send to bitmask of vts */ 41 41 42 - #define VT_RELDISP _IO('V', 0x05) /* release display */ 42 + #define VT_RELDISP 0x5605 /* release display */ 43 43 44 - #define VT_ACTIVATE _IO('V', 0x06) /* make vt active */ 45 - #define VT_WAITACTIVE _IO('V', 0x07) /* wait for vt active */ 46 - #define VT_DISALLOCATE _IO('V', 0x08) /* free memory associated to vt */ 44 + #define VT_ACTIVATE 0x5606 /* make vt active */ 45 + #define VT_WAITACTIVE 0x5607 /* wait for vt active */ 46 + #define VT_DISALLOCATE 0x5608 /* free memory associated to vt */ 47 47 48 48 struct vt_sizes { 49 49 __u16 v_rows; /* number of rows */ 50 50 __u16 v_cols; /* number of columns */ 51 51 __u16 v_scrollsize; /* number of lines of scrollback */ 52 52 }; 53 - #define VT_RESIZE _IO('V', 0x09) /* set kernel's idea of screensize */ 53 + #define VT_RESIZE 0x5609 /* set kernel's idea of screensize */ 54 54 55 55 struct vt_consize { 56 56 __u16 v_rows; /* number of rows */ ··· 60 60 __u16 v_vcol; /* number of pixel columns on screen */ 61 61 __u16 v_ccol; /* number of pixel columns per character */ 62 62 }; 63 - #define VT_RESIZEX _IO('V', 0x0A) /* set kernel's idea of screensize + more */ 64 - #define VT_LOCKSWITCH _IO('V', 0x0B) /* disallow vt switching */ 65 - #define VT_UNLOCKSWITCH _IO('V', 0x0C) /* allow vt switching */ 66 - #define VT_GETHIFONTMASK _IO('V', 0x0D) /* return hi font mask */ 63 + #define VT_RESIZEX 0x560A /* set kernel's idea of screensize + more */ 64 + #define VT_LOCKSWITCH 0x560B /* disallow vt switching */ 65 + #define VT_UNLOCKSWITCH 0x560C /* allow vt switching */ 66 + #define VT_GETHIFONTMASK 0x560D /* return hi font mask */ 67 67 68 68 struct vt_event { 69 69 __u32 event; ··· 77 77 __u32 pad[4]; /* Padding for expansion */ 78 78 }; 79 79 80 - #define VT_WAITEVENT _IO('V', 0x0E) /* Wait for an event */ 80 + #define VT_WAITEVENT 0x560E /* Wait for an event */ 81 81 82 82 struct vt_setactivate { 83 83 __u32 console; 84 84 struct vt_mode mode; 85 85 }; 86 86 87 - #define VT_SETACTIVATE _IO('V', 0x0F) /* Activate and set the mode of a console */ 87 + #define VT_SETACTIVATE 0x560F /* Activate and set the mode of a console */ 88 88 89 89 /* get console size and cursor position */ 90 90 struct vt_consizecsrpos {

Configure Feed

Configure Feed