Skip to content

Commit 73a2d09

Browse files
arndbH. Peter Anvin
arndb
authored and
H. Peter Anvin
committed
x86: remove all now-duplicate header files
All files that have been made identical to the asm-generic version in the previous patches can now be removed, guaranteeing that this does not introduce semantic changes. Signed-off-by: Arnd Bergmann <arnd@arndb.de> LKML-Reference: <cover.1245354003.git.arnd@arndb.de> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
1 parent 69d5ffd commit 73a2d09

19 files changed

+14
-840
lines changed

‎arch/x86/include/asm/generic-mman.h

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎arch/x86/include/asm/generic-module.h

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎arch/x86/include/asm/generic-scatterlist.h

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎arch/x86/include/asm/generic-types.h

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎arch/x86/include/asm/generic-ucontext.h

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎arch/x86/include/asm/ioctls.h

Lines changed: 1 addition & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1 @@
1-
#ifndef __ASM_GENERIC_IOCTLS_H
2-
#define __ASM_GENERIC_IOCTLS_H
3-
4-
#include <linux/ioctl.h>
5-
6-
/*
7-
* These are the most common definitions for tty ioctl numbers.
8-
* Most of them do not use the recommended _IOC(), but there is
9-
* probably some source code out there hardcoding the number,
10-
* so we might as well use them for all new platforms.
11-
*
12-
* The architectures that use different values here typically
13-
* try to be compatible with some Unix variants for the same
14-
* architecture.
15-
*/
16-
17-
/* 0x54 is just a magic number to make these relatively unique ('T') */
18-
19-
#define TCGETS 0x5401
20-
#define TCSETS 0x5402
21-
#define TCSETSW 0x5403
22-
#define TCSETSF 0x5404
23-
#define TCGETA 0x5405
24-
#define TCSETA 0x5406
25-
#define TCSETAW 0x5407
26-
#define TCSETAF 0x5408
27-
#define TCSBRK 0x5409
28-
#define TCXONC 0x540A
29-
#define TCFLSH 0x540B
30-
#define TIOCEXCL 0x540C
31-
#define TIOCNXCL 0x540D
32-
#define TIOCSCTTY 0x540E
33-
#define TIOCGPGRP 0x540F
34-
#define TIOCSPGRP 0x5410
35-
#define TIOCOUTQ 0x5411
36-
#define TIOCSTI 0x5412
37-
#define TIOCGWINSZ 0x5413
38-
#define TIOCSWINSZ 0x5414
39-
#define TIOCMGET 0x5415
40-
#define TIOCMBIS 0x5416
41-
#define TIOCMBIC 0x5417
42-
#define TIOCMSET 0x5418
43-
#define TIOCGSOFTCAR 0x5419
44-
#define TIOCSSOFTCAR 0x541A
45-
#define FIONREAD 0x541B
46-
#define TIOCINQ FIONREAD
47-
#define TIOCLINUX 0x541C
48-
#define TIOCCONS 0x541D
49-
#define TIOCGSERIAL 0x541E
50-
#define TIOCSSERIAL 0x541F
51-
#define TIOCPKT 0x5420
52-
#define FIONBIO 0x5421
53-
#define TIOCNOTTY 0x5422
54-
#define TIOCSETD 0x5423
55-
#define TIOCGETD 0x5424
56-
#define TCSBRKP 0x5425 /* Needed for POSIX tcsendbreak() */
57-
#define TIOCSBRK 0x5427 /* BSD compatibility */
58-
#define TIOCCBRK 0x5428 /* BSD compatibility */
59-
#define TIOCGSID 0x5429 /* Return the session ID of FD */
60-
#define TCGETS2 _IOR('T', 0x2A, struct termios2)
61-
#define TCSETS2 _IOW('T', 0x2B, struct termios2)
62-
#define TCSETSW2 _IOW('T', 0x2C, struct termios2)
63-
#define TCSETSF2 _IOW('T', 0x2D, struct termios2)
64-
#define TIOCGRS485 0x542E
65-
#define TIOCSRS485 0x542F
66-
#define TIOCGPTN _IOR('T', 0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
67-
#define TIOCSPTLCK _IOW('T', 0x31, int) /* Lock/unlock Pty */
68-
#define TCGETX 0x5432 /* SYS5 TCGETX compatibility */
69-
#define TCSETX 0x5433
70-
#define TCSETXF 0x5434
71-
#define TCSETXW 0x5435
72-
73-
#define FIONCLEX 0x5450
74-
#define FIOCLEX 0x5451
75-
#define FIOASYNC 0x5452
76-
#define TIOCSERCONFIG 0x5453
77-
#define TIOCSERGWILD 0x5454
78-
#define TIOCSERSWILD 0x5455
79-
#define TIOCGLCKTRMIOS 0x5456
80-
#define TIOCSLCKTRMIOS 0x5457
81-
#define TIOCSERGSTRUCT 0x5458 /* For debugging only */
82-
#define TIOCSERGETLSR 0x5459 /* Get line status register */
83-
#define TIOCSERGETMULTI 0x545A /* Get multiport config */
84-
#define TIOCSERSETMULTI 0x545B /* Set multiport config */
85-
86-
#define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
87-
#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
88-
89-
/*
90-
* some architectures define FIOQSIZE as 0x545E, which is used for
91-
* TIOCGHAYESESP on others
92-
*/
93-
#ifndef FIOQSIZE
94-
# define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */
95-
# define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */
96-
# define FIOQSIZE 0x5460
97-
#endif
98-
99-
/* Used for packet mode */
100-
#define TIOCPKT_DATA 0
101-
#define TIOCPKT_FLUSHREAD 1
102-
#define TIOCPKT_FLUSHWRITE 2
103-
#define TIOCPKT_STOP 4
104-
#define TIOCPKT_START 8
105-
#define TIOCPKT_NOSTOP 16
106-
#define TIOCPKT_DOSTOP 32
107-
108-
#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */
109-
110-
#endif /* __ASM_GENERIC_IOCTLS_H */
1+
#include <asm-generic/ioctls.h>

‎arch/x86/include/asm/ipcbuf.h

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1 @@
1-
#ifndef __ASM_GENERIC_IPCBUF_H
2-
#define __ASM_GENERIC_IPCBUF_H
3-
4-
/*
5-
* The generic ipc64_perm structure:
6-
* Note extra padding because this structure is passed back and forth
7-
* between kernel and user space.
8-
*
9-
* ipc64_perm was originally meant to be architecture specific, but
10-
* everyone just ended up making identical copies without specific
11-
* optimizations, so we may just as well all use the same one.
12-
*
13-
* Pad space is left for:
14-
* - 32-bit mode_t on architectures that only had 16 bit
15-
* - 32-bit seq
16-
* - 2 miscellaneous 32-bit values
17-
*/
18-
19-
struct ipc64_perm {
20-
__kernel_key_t key;
21-
__kernel_uid32_t uid;
22-
__kernel_gid32_t gid;
23-
__kernel_uid32_t cuid;
24-
__kernel_gid32_t cgid;
25-
__kernel_mode_t mode;
26-
unsigned short __pad1;
27-
unsigned short seq;
28-
unsigned short __pad2;
29-
unsigned long __unused1;
30-
unsigned long __unused2;
31-
};
32-
33-
#endif /* __ASM_GENERIC_IPCBUF_H */
1+
#include <asm-generic/ipcbuf.h>

‎arch/x86/include/asm/mman.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33

44
#define MAP_32BIT 0x40 /* only give out 32bit addresses */
55

6-
#include <asm/generic-mman.h>
6+
#include <asm-generic/mman.h>
77

88
#endif /* _ASM_X86_MMAN_H */

‎arch/x86/include/asm/module.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef _ASM_X86_MODULE_H
22
#define _ASM_X86_MODULE_H
33

4-
#include <asm/generic-module.h>
4+
#include <asm-generic/module.h>
55

66
#ifdef CONFIG_X86_64
77
/* X86_64 does not define MODULE_PROC_FAMILY */

‎arch/x86/include/asm/msgbuf.h

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1 @@
1-
#ifndef __ASM_GENERIC_MSGBUF_H
2-
#define __ASM_GENERIC_MSGBUF_H
3-
4-
#include <asm/bitsperlong.h>
5-
/*
6-
* generic msqid64_ds structure.
7-
*
8-
* Note extra padding because this structure is passed back and forth
9-
* between kernel and user space.
10-
*
11-
* msqid64_ds was originally meant to be architecture specific, but
12-
* everyone just ended up making identical copies without specific
13-
* optimizations, so we may just as well all use the same one.
14-
*
15-
* 64 bit architectures typically define a 64 bit __kernel_time_t,
16-
* so they do not need the first three padding words.
17-
* On big-endian systems, the padding is in the wrong place.
18-
*
19-
* Pad space is left for:
20-
* - 64-bit time_t to solve y2038 problem
21-
* - 2 miscellaneous 32-bit values
22-
*/
23-
24-
struct msqid64_ds {
25-
struct ipc64_perm msg_perm;
26-
__kernel_time_t msg_stime; /* last msgsnd time */
27-
#if __BITS_PER_LONG != 64
28-
unsigned long __unused1;
29-
#endif
30-
__kernel_time_t msg_rtime; /* last msgrcv time */
31-
#if __BITS_PER_LONG != 64
32-
unsigned long __unused2;
33-
#endif
34-
__kernel_time_t msg_ctime; /* last change time */
35-
#if __BITS_PER_LONG != 64
36-
unsigned long __unused3;
37-
#endif
38-
unsigned long msg_cbytes; /* current number of bytes on queue */
39-
unsigned long msg_qnum; /* number of messages in queue */
40-
unsigned long msg_qbytes; /* max number of bytes on queue */
41-
__kernel_pid_t msg_lspid; /* pid of last msgsnd */
42-
__kernel_pid_t msg_lrpid; /* last receive pid */
43-
unsigned long __unused4;
44-
unsigned long __unused5;
45-
};
46-
47-
#endif /* __ASM_GENERIC_MSGBUF_H */
1+
#include <asm-generic/msgbuf.h>

‎arch/x86/include/asm/param.h

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1 @@
1-
#ifndef __ASM_GENERIC_PARAM_H
2-
#define __ASM_GENERIC_PARAM_H
3-
4-
#ifdef __KERNEL__
5-
# define HZ CONFIG_HZ /* Internal kernel timer frequency */
6-
# define USER_HZ 100 /* some user interfaces are */
7-
# define CLOCKS_PER_SEC (USER_HZ) /* in "ticks" like times() */
8-
#endif
9-
10-
#ifndef HZ
11-
#define HZ 100
12-
#endif
13-
14-
#ifndef EXEC_PAGESIZE
15-
#define EXEC_PAGESIZE 4096
16-
#endif
17-
18-
#ifndef NOGROUP
19-
#define NOGROUP (-1)
20-
#endif
21-
22-
#define MAXHOSTNAMELEN 64 /* max length of hostname */
23-
24-
#endif /* __ASM_GENERIC_PARAM_H */
1+
#include <asm-generic/param.h>

‎arch/x86/include/asm/scatterlist.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33

44
#define ISA_DMA_THRESHOLD (0x00ffffff)
55

6-
#include <asm/generic-scatterlist.h>
6+
#include <asm-generic/scatterlist.h>
77

88
#endif /* _ASM_X86_SCATTERLIST_H */

0 commit comments

Comments
 (0)