Skip to content

Commit f26ee67

Browse files
torvaldstorvalds
committed
Merge tag 'tty-6.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty fix from Greg KH: "Here is a single revert for a much-reported regression in 6.10-rc1 when it comes to a few older architectures. Turns out that the VT ioctls don't work the same across all cpu types because of some old compatibility requrements for stuff like alpha and powerpc. So revert the change that attempted to have them use the _IO() macros and go back to the known-working values instead. This has NOT been in linux-next but has had many reports that it fixes the issue with 6.10-rc1" * tag 'tty-6.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: Revert "VT: Use macros to define ioctls"
2 parents d9aab0b + 7bc4244 commit f26ee67

File tree

1 file changed

+47
-49
lines changed
  • include/uapi/linux

1 file changed

+47
-49
lines changed

‎include/uapi/linux/kd.h‎

Lines changed: 47 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -5,61 +5,60 @@
55
#include <linux/compiler.h>
66

77
/* 0x4B is 'K', to avoid collision with termios and vt */
8-
#define KD_IOCTL_BASE 'K'
98

10-
#define GIO_FONT _IO(KD_IOCTL_BASE, 0x60) /* gets font in expanded form */
11-
#define PIO_FONT _IO(KD_IOCTL_BASE, 0x61) /* use font in expanded form */
9+
#define GIO_FONT 0x4B60 /* gets font in expanded form */
10+
#define PIO_FONT 0x4B61 /* use font in expanded form */
1211

13-
#define GIO_FONTX _IO(KD_IOCTL_BASE, 0x6B) /* get font using struct consolefontdesc */
14-
#define PIO_FONTX _IO(KD_IOCTL_BASE, 0x6C) /* set font using struct consolefontdesc */
12+
#define GIO_FONTX 0x4B6B /* get font using struct consolefontdesc */
13+
#define PIO_FONTX 0x4B6C /* set font using struct consolefontdesc */
1514
struct consolefontdesc {
1615
unsigned short charcount; /* characters in font (256 or 512) */
1716
unsigned short charheight; /* scan lines per character (1-32) */
1817
char __user *chardata; /* font data in expanded form */
1918
};
2019

21-
#define PIO_FONTRESET _IO(KD_IOCTL_BASE, 0x6D) /* reset to default font */
20+
#define PIO_FONTRESET 0x4B6D /* reset to default font */
2221

23-
#define GIO_CMAP _IO(KD_IOCTL_BASE, 0x70) /* gets colour palette on VGA+ */
24-
#define PIO_CMAP _IO(KD_IOCTL_BASE, 0x71) /* sets colour palette on VGA+ */
22+
#define GIO_CMAP 0x4B70 /* gets colour palette on VGA+ */
23+
#define PIO_CMAP 0x4B71 /* sets colour palette on VGA+ */
2524

26-
#define KIOCSOUND _IO(KD_IOCTL_BASE, 0x2F) /* start sound generation (0 for off) */
27-
#define KDMKTONE _IO(KD_IOCTL_BASE, 0x30) /* generate tone */
25+
#define KIOCSOUND 0x4B2F /* start sound generation (0 for off) */
26+
#define KDMKTONE 0x4B30 /* generate tone */
2827

29-
#define KDGETLED _IO(KD_IOCTL_BASE, 0x31) /* return current led state */
30-
#define KDSETLED _IO(KD_IOCTL_BASE, 0x32) /* set led state [lights, not flags] */
28+
#define KDGETLED 0x4B31 /* return current led state */
29+
#define KDSETLED 0x4B32 /* set led state [lights, not flags] */
3130
#define LED_SCR 0x01 /* scroll lock led */
3231
#define LED_NUM 0x02 /* num lock led */
3332
#define LED_CAP 0x04 /* caps lock led */
3433

35-
#define KDGKBTYPE _IO(KD_IOCTL_BASE, 0x33) /* get keyboard type */
34+
#define KDGKBTYPE 0x4B33 /* get keyboard type */
3635
#define KB_84 0x01
3736
#define KB_101 0x02 /* this is what we always answer */
3837
#define KB_OTHER 0x03
3938

40-
#define KDADDIO _IO(KD_IOCTL_BASE, 0x34) /* add i/o port as valid */
41-
#define KDDELIO _IO(KD_IOCTL_BASE, 0x35) /* del i/o port as valid */
42-
#define KDENABIO _IO(KD_IOCTL_BASE, 0x36) /* enable i/o to video board */
43-
#define KDDISABIO _IO(KD_IOCTL_BASE, 0x37) /* disable i/o to video board */
39+
#define KDADDIO 0x4B34 /* add i/o port as valid */
40+
#define KDDELIO 0x4B35 /* del i/o port as valid */
41+
#define KDENABIO 0x4B36 /* enable i/o to video board */
42+
#define KDDISABIO 0x4B37 /* disable i/o to video board */
4443

45-
#define KDSETMODE _IO(KD_IOCTL_BASE, 0x3A) /* set text/graphics mode */
44+
#define KDSETMODE 0x4B3A /* set text/graphics mode */
4645
#define KD_TEXT 0x00
4746
#define KD_GRAPHICS 0x01
4847
#define KD_TEXT0 0x02 /* obsolete */
4948
#define KD_TEXT1 0x03 /* obsolete */
50-
#define KDGETMODE _IO(KD_IOCTL_BASE, 0x3B) /* get current mode */
49+
#define KDGETMODE 0x4B3B /* get current mode */
5150

52-
#define KDMAPDISP _IO(KD_IOCTL_BASE, 0x3C) /* map display into address space */
53-
#define KDUNMAPDISP _IO(KD_IOCTL_BASE, 0x3D) /* unmap display from address space */
51+
#define KDMAPDISP 0x4B3C /* map display into address space */
52+
#define KDUNMAPDISP 0x4B3D /* unmap display from address space */
5453

5554
typedef char scrnmap_t;
5655
#define E_TABSZ 256
57-
#define GIO_SCRNMAP _IO(KD_IOCTL_BASE, 0x40) /* get screen mapping from kernel */
58-
#define PIO_SCRNMAP _IO(KD_IOCTL_BASE, 0x41) /* put screen mapping table in kernel */
59-
#define GIO_UNISCRNMAP _IO(KD_IOCTL_BASE, 0x69) /* get full Unicode screen mapping */
60-
#define PIO_UNISCRNMAP _IO(KD_IOCTL_BASE, 0x6A) /* set full Unicode screen mapping */
56+
#define GIO_SCRNMAP 0x4B40 /* get screen mapping from kernel */
57+
#define PIO_SCRNMAP 0x4B41 /* put screen mapping table in kernel */
58+
#define GIO_UNISCRNMAP 0x4B69 /* get full Unicode screen mapping */
59+
#define PIO_UNISCRNMAP 0x4B6A /* set full Unicode screen mapping */
6160

62-
#define GIO_UNIMAP _IO(KD_IOCTL_BASE, 0x66) /* get unicode-to-font mapping from kernel */
61+
#define GIO_UNIMAP 0x4B66 /* get unicode-to-font mapping from kernel */
6362
struct unipair {
6463
unsigned short unicode;
6564
unsigned short fontpos;
@@ -68,8 +67,8 @@ struct unimapdesc {
6867
unsigned short entry_ct;
6968
struct unipair __user *entries;
7069
};
71-
#define PIO_UNIMAP _IO(KD_IOCTL_BASE, 0x67) /* put unicode-to-font mapping in kernel */
72-
#define PIO_UNIMAPCLR _IO(KD_IOCTL_BASE, 0x68) /* clear table, possibly advise hash algorithm */
70+
#define PIO_UNIMAP 0x4B67 /* put unicode-to-font mapping in kernel */
71+
#define PIO_UNIMAPCLR 0x4B68 /* clear table, possibly advise hash algorithm */
7372
struct unimapinit {
7473
unsigned short advised_hashsize; /* 0 if no opinion */
7574
unsigned short advised_hashstep; /* 0 if no opinion */
@@ -84,19 +83,19 @@ struct unimapinit {
8483
#define K_MEDIUMRAW 0x02
8584
#define K_UNICODE 0x03
8685
#define K_OFF 0x04
87-
#define KDGKBMODE _IO(KD_IOCTL_BASE, 0x44) /* gets current keyboard mode */
88-
#define KDSKBMODE _IO(KD_IOCTL_BASE, 0x45) /* sets current keyboard mode */
86+
#define KDGKBMODE 0x4B44 /* gets current keyboard mode */
87+
#define KDSKBMODE 0x4B45 /* sets current keyboard mode */
8988

9089
#define K_METABIT 0x03
9190
#define K_ESCPREFIX 0x04
92-
#define KDGKBMETA _IO(KD_IOCTL_BASE, 0x62) /* gets meta key handling mode */
93-
#define KDSKBMETA _IO(KD_IOCTL_BASE, 0x63) /* sets meta key handling mode */
91+
#define KDGKBMETA 0x4B62 /* gets meta key handling mode */
92+
#define KDSKBMETA 0x4B63 /* sets meta key handling mode */
9493

9594
#define K_SCROLLLOCK 0x01
9695
#define K_NUMLOCK 0x02
9796
#define K_CAPSLOCK 0x04
98-
#define KDGKBLED _IO(KD_IOCTL_BASE, 0x64) /* get led flags (not lights) */
99-
#define KDSKBLED _IO(KD_IOCTL_BASE, 0x65) /* set led flags (not lights) */
97+
#define KDGKBLED 0x4B64 /* get led flags (not lights) */
98+
#define KDSKBLED 0x4B65 /* set led flags (not lights) */
10099

101100
struct kbentry {
102101
unsigned char kb_table;
@@ -108,15 +107,15 @@ struct kbentry {
108107
#define K_ALTTAB 0x02
109108
#define K_ALTSHIFTTAB 0x03
110109

111-
#define KDGKBENT _IO(KD_IOCTL_BASE, 0x46) /* gets one entry in translation table */
112-
#define KDSKBENT _IO(KD_IOCTL_BASE, 0x47) /* sets one entry in translation table */
110+
#define KDGKBENT 0x4B46 /* gets one entry in translation table */
111+
#define KDSKBENT 0x4B47 /* sets one entry in translation table */
113112

114113
struct kbsentry {
115114
unsigned char kb_func;
116115
unsigned char kb_string[512];
117116
};
118-
#define KDGKBSENT _IO(KD_IOCTL_BASE, 0x48) /* gets one function key string entry */
119-
#define KDSKBSENT _IO(KD_IOCTL_BASE, 0x49) /* sets one function key string entry */
117+
#define KDGKBSENT 0x4B48 /* gets one function key string entry */
118+
#define KDSKBSENT 0x4B49 /* sets one function key string entry */
120119

121120
struct kbdiacr {
122121
unsigned char diacr, base, result;
@@ -125,8 +124,8 @@ struct kbdiacrs {
125124
unsigned int kb_cnt; /* number of entries in following array */
126125
struct kbdiacr kbdiacr[256]; /* MAX_DIACR from keyboard.h */
127126
};
128-
#define KDGKBDIACR _IO(KD_IOCTL_BASE, 0x4A) /* read kernel accent table */
129-
#define KDSKBDIACR _IO(KD_IOCTL_BASE, 0x4B) /* write kernel accent table */
127+
#define KDGKBDIACR 0x4B4A /* read kernel accent table */
128+
#define KDSKBDIACR 0x4B4B /* write kernel accent table */
130129

131130
struct kbdiacruc {
132131
unsigned int diacr, base, result;
@@ -135,28 +134,27 @@ struct kbdiacrsuc {
135134
unsigned int kb_cnt; /* number of entries in following array */
136135
struct kbdiacruc kbdiacruc[256]; /* MAX_DIACR from keyboard.h */
137136
};
138-
#define KDGKBDIACRUC _IO(KD_IOCTL_BASE, 0xFA) /* read kernel accent table - UCS */
139-
#define KDSKBDIACRUC _IO(KD_IOCTL_BASE, 0xFB) /* write kernel accent table - UCS */
137+
#define KDGKBDIACRUC 0x4BFA /* read kernel accent table - UCS */
138+
#define KDSKBDIACRUC 0x4BFB /* write kernel accent table - UCS */
140139

141140
struct kbkeycode {
142141
unsigned int scancode, keycode;
143142
};
144-
#define KDGETKEYCODE _IO(KD_IOCTL_BASE, 0x4C) /* read kernel keycode table entry */
145-
#define KDSETKEYCODE _IO(KD_IOCTL_BASE, 0x4D) /* write kernel keycode table entry */
143+
#define KDGETKEYCODE 0x4B4C /* read kernel keycode table entry */
144+
#define KDSETKEYCODE 0x4B4D /* write kernel keycode table entry */
146145

147-
#define KDSIGACCEPT _IO(KD_IOCTL_BASE, 0x4E) /* accept kbd generated signals */
146+
#define KDSIGACCEPT 0x4B4E /* accept kbd generated signals */
148147

149148
struct kbd_repeat {
150149
int delay; /* in msec; <= 0: don't change */
151150
int period; /* in msec; <= 0: don't change */
152151
/* earlier this field was misnamed "rate" */
153152
};
154153

155-
#define KDKBDREP _IO(KD_IOCTL_BASE, 0x52) /* set keyboard delay/repeat rate;
156-
* actually used values are returned
157-
*/
154+
#define KDKBDREP 0x4B52 /* set keyboard delay/repeat rate;
155+
* actually used values are returned */
158156

159-
#define KDFONTOP _IO(KD_IOCTL_BASE, 0x72) /* font operations */
157+
#define KDFONTOP 0x4B72 /* font operations */
160158

161159
struct console_font_op {
162160
unsigned int op; /* operation code KD_FONT_OP_* */

0 commit comments

Comments
 (0)