aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2009-06-18 15:48:17 -0400
committerH. Peter Anvin <hpa@zytor.com>2009-06-18 17:39:47 -0400
commit7bfd124d6dae7d394e73753300594a81a022fe7d (patch)
treef6b82b71071a5dcda066f0c2b33739d06b8bab65 /arch/x86
parent4adc667593f83a18a8e54ce94f250fd166a272ac (diff)
x86: convert trivial headers to asm-generic version
For these nine header files, the asm-generic version should be semantically identical to what is in x86. Change the contents to be binary identical, for better review. 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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/include/asm/ioctls.h40
-rw-r--r--arch/x86/include/asm/ipcbuf.h15
-rw-r--r--arch/x86/include/asm/msgbuf.h30
-rw-r--r--arch/x86/include/asm/param.h8
-rw-r--r--arch/x86/include/asm/shmbuf.h28
-rw-r--r--arch/x86/include/asm/socket.h10
-rw-r--r--arch/x86/include/asm/sockios.h6
-rw-r--r--arch/x86/include/asm/termbits.h8
8 files changed, 92 insertions, 53 deletions
diff --git a/arch/x86/include/asm/ioctls.h b/arch/x86/include/asm/ioctls.h
index 0d5b23b7b06e..a799e20a769e 100644
--- a/arch/x86/include/asm/ioctls.h
+++ b/arch/x86/include/asm/ioctls.h
@@ -1,12 +1,23 @@
1#ifndef _ASM_X86_IOCTLS_H 1#ifndef __ASM_GENERIC_IOCTLS_H
2#define _ASM_X86_IOCTLS_H 2#define __ASM_GENERIC_IOCTLS_H
3 3
4#include <asm/ioctl.h> 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 */
5 16
6/* 0x54 is just a magic number to make these relatively unique ('T') */ 17/* 0x54 is just a magic number to make these relatively unique ('T') */
7 18
8#define TCGETS 0x5401 19#define TCGETS 0x5401
9#define TCSETS 0x5402 /* Clashes with SNDCTL_TMR_START sound ioctl */ 20#define TCSETS 0x5402
10#define TCSETSW 0x5403 21#define TCSETSW 0x5403
11#define TCSETSF 0x5404 22#define TCSETSF 0x5404
12#define TCGETA 0x5405 23#define TCGETA 0x5405
@@ -43,7 +54,6 @@
43#define TIOCSETD 0x5423 54#define TIOCSETD 0x5423
44#define TIOCGETD 0x5424 55#define TIOCGETD 0x5424
45#define TCSBRKP 0x5425 /* Needed for POSIX tcsendbreak() */ 56#define TCSBRKP 0x5425 /* Needed for POSIX tcsendbreak() */
46/* #define TIOCTTYGSTRUCT 0x5426 - Former debugging-only ioctl */
47#define TIOCSBRK 0x5427 /* BSD compatibility */ 57#define TIOCSBRK 0x5427 /* BSD compatibility */
48#define TIOCCBRK 0x5428 /* BSD compatibility */ 58#define TIOCCBRK 0x5428 /* BSD compatibility */
49#define TIOCGSID 0x5429 /* Return the session ID of FD */ 59#define TIOCGSID 0x5429 /* Return the session ID of FD */
@@ -53,8 +63,7 @@
53#define TCSETSF2 _IOW('T', 0x2D, struct termios2) 63#define TCSETSF2 _IOW('T', 0x2D, struct termios2)
54#define TIOCGRS485 0x542E 64#define TIOCGRS485 0x542E
55#define TIOCSRS485 0x542F 65#define TIOCSRS485 0x542F
56#define TIOCGPTN _IOR('T', 0x30, unsigned int) 66#define TIOCGPTN _IOR('T', 0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
57 /* Get Pty Number (of pty-mux device) */
58#define TIOCSPTLCK _IOW('T', 0x31, int) /* Lock/unlock Pty */ 67#define TIOCSPTLCK _IOW('T', 0x31, int) /* Lock/unlock Pty */
59#define TCGETX 0x5432 /* SYS5 TCGETX compatibility */ 68#define TCGETX 0x5432 /* SYS5 TCGETX compatibility */
60#define TCSETX 0x5433 69#define TCSETX 0x5433
@@ -76,9 +85,16 @@
76 85
77#define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ 86#define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
78#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ 87#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
79#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ 88
80#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ 89/*
81#define FIOQSIZE 0x5460 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
82 98
83/* Used for packet mode */ 99/* Used for packet mode */
84#define TIOCPKT_DATA 0 100#define TIOCPKT_DATA 0
@@ -89,6 +105,6 @@
89#define TIOCPKT_NOSTOP 16 105#define TIOCPKT_NOSTOP 16
90#define TIOCPKT_DOSTOP 32 106#define TIOCPKT_DOSTOP 32
91 107
92#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ 108#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */
93 109
94#endif /* _ASM_X86_IOCTLS_H */ 110#endif /* __ASM_GENERIC_IOCTLS_H */
diff --git a/arch/x86/include/asm/ipcbuf.h b/arch/x86/include/asm/ipcbuf.h
index ee678fd51594..888ca1c8f951 100644
--- a/arch/x86/include/asm/ipcbuf.h
+++ b/arch/x86/include/asm/ipcbuf.h
@@ -1,13 +1,18 @@
1#ifndef _ASM_X86_IPCBUF_H 1#ifndef __ASM_GENERIC_IPCBUF_H
2#define _ASM_X86_IPCBUF_H 2#define __ASM_GENERIC_IPCBUF_H
3 3
4/* 4/*
5 * The ipc64_perm structure for x86 architecture. 5 * The generic ipc64_perm structure:
6 * Note extra padding because this structure is passed back and forth 6 * Note extra padding because this structure is passed back and forth
7 * between kernel and user space. 7 * between kernel and user space.
8 * 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 *
9 * Pad space is left for: 13 * Pad space is left for:
10 * - 32-bit mode_t and seq 14 * - 32-bit mode_t on architectures that only had 16 bit
15 * - 32-bit seq
11 * - 2 miscellaneous 32-bit values 16 * - 2 miscellaneous 32-bit values
12 */ 17 */
13 18
@@ -25,4 +30,4 @@ struct ipc64_perm {
25 unsigned long __unused2; 30 unsigned long __unused2;
26}; 31};
27 32
28#endif /* _ASM_X86_IPCBUF_H */ 33#endif /* __ASM_GENERIC_IPCBUF_H */
diff --git a/arch/x86/include/asm/msgbuf.h b/arch/x86/include/asm/msgbuf.h
index 7e4e9481f51c..aec850d9159e 100644
--- a/arch/x86/include/asm/msgbuf.h
+++ b/arch/x86/include/asm/msgbuf.h
@@ -1,30 +1,38 @@
1#ifndef _ASM_X86_MSGBUF_H 1#ifndef __ASM_GENERIC_MSGBUF_H
2#define _ASM_X86_MSGBUF_H 2#define __ASM_GENERIC_MSGBUF_H
3 3
4#include <asm/bitsperlong.h>
4/* 5/*
5 * The msqid64_ds structure for i386 architecture. 6 * generic msqid64_ds structure.
7 *
6 * Note extra padding because this structure is passed back and forth 8 * Note extra padding because this structure is passed back and forth
7 * between kernel and user space. 9 * between kernel and user space.
8 * 10 *
9 * Pad space on i386 is left for: 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:
10 * - 64-bit time_t to solve y2038 problem 20 * - 64-bit time_t to solve y2038 problem
11 * - 2 miscellaneous 32-bit values 21 * - 2 miscellaneous 32-bit values
12 *
13 * Pad space on x8664 is left for:
14 * - 2 miscellaneous 64-bit values
15 */ 22 */
23
16struct msqid64_ds { 24struct msqid64_ds {
17 struct ipc64_perm msg_perm; 25 struct ipc64_perm msg_perm;
18 __kernel_time_t msg_stime; /* last msgsnd time */ 26 __kernel_time_t msg_stime; /* last msgsnd time */
19#ifdef __i386__ 27#if __BITS_PER_LONG != 64
20 unsigned long __unused1; 28 unsigned long __unused1;
21#endif 29#endif
22 __kernel_time_t msg_rtime; /* last msgrcv time */ 30 __kernel_time_t msg_rtime; /* last msgrcv time */
23#ifdef __i386__ 31#if __BITS_PER_LONG != 64
24 unsigned long __unused2; 32 unsigned long __unused2;
25#endif 33#endif
26 __kernel_time_t msg_ctime; /* last change time */ 34 __kernel_time_t msg_ctime; /* last change time */
27#ifdef __i386__ 35#if __BITS_PER_LONG != 64
28 unsigned long __unused3; 36 unsigned long __unused3;
29#endif 37#endif
30 unsigned long msg_cbytes; /* current number of bytes on queue */ 38 unsigned long msg_cbytes; /* current number of bytes on queue */
@@ -36,4 +44,4 @@ struct msqid64_ds {
36 unsigned long __unused5; 44 unsigned long __unused5;
37}; 45};
38 46
39#endif /* _ASM_X86_MSGBUF_H */ 47#endif /* __ASM_GENERIC_MSGBUF_H */
diff --git a/arch/x86/include/asm/param.h b/arch/x86/include/asm/param.h
index 6f0d0422f4ca..cdf8251bfb6c 100644
--- a/arch/x86/include/asm/param.h
+++ b/arch/x86/include/asm/param.h
@@ -1,5 +1,5 @@
1#ifndef _ASM_X86_PARAM_H 1#ifndef __ASM_GENERIC_PARAM_H
2#define _ASM_X86_PARAM_H 2#define __ASM_GENERIC_PARAM_H
3 3
4#ifdef __KERNEL__ 4#ifdef __KERNEL__
5# define HZ CONFIG_HZ /* Internal kernel timer frequency */ 5# define HZ CONFIG_HZ /* Internal kernel timer frequency */
@@ -11,7 +11,9 @@
11#define HZ 100 11#define HZ 100
12#endif 12#endif
13 13
14#ifndef EXEC_PAGESIZE
14#define EXEC_PAGESIZE 4096 15#define EXEC_PAGESIZE 4096
16#endif
15 17
16#ifndef NOGROUP 18#ifndef NOGROUP
17#define NOGROUP (-1) 19#define NOGROUP (-1)
@@ -19,4 +21,4 @@
19 21
20#define MAXHOSTNAMELEN 64 /* max length of hostname */ 22#define MAXHOSTNAMELEN 64 /* max length of hostname */
21 23
22#endif /* _ASM_X86_PARAM_H */ 24#endif /* __ASM_GENERIC_PARAM_H */
diff --git a/arch/x86/include/asm/shmbuf.h b/arch/x86/include/asm/shmbuf.h
index b51413b74971..5768fa60ac82 100644
--- a/arch/x86/include/asm/shmbuf.h
+++ b/arch/x86/include/asm/shmbuf.h
@@ -1,32 +1,40 @@
1#ifndef _ASM_X86_SHMBUF_H 1#ifndef __ASM_GENERIC_SHMBUF_H
2#define _ASM_X86_SHMBUF_H 2#define __ASM_GENERIC_SHMBUF_H
3
4#include <asm/bitsperlong.h>
3 5
4/* 6/*
5 * The shmid64_ds structure for x86 architecture. 7 * The shmid64_ds structure for x86 architecture.
6 * Note extra padding because this structure is passed back and forth 8 * Note extra padding because this structure is passed back and forth
7 * between kernel and user space. 9 * between kernel and user space.
8 * 10 *
9 * Pad space on 32 bit is left for: 11 * shmid64_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 two padding words.
17 * On big-endian systems, the padding is in the wrong place.
18 *
19 *
20 * Pad space is left for:
10 * - 64-bit time_t to solve y2038 problem 21 * - 64-bit time_t to solve y2038 problem
11 * - 2 miscellaneous 32-bit values 22 * - 2 miscellaneous 32-bit values
12 *
13 * Pad space on 64 bit is left for:
14 * - 2 miscellaneous 64-bit values
15 */ 23 */
16 24
17struct shmid64_ds { 25struct shmid64_ds {
18 struct ipc64_perm shm_perm; /* operation perms */ 26 struct ipc64_perm shm_perm; /* operation perms */
19 size_t shm_segsz; /* size of segment (bytes) */ 27 size_t shm_segsz; /* size of segment (bytes) */
20 __kernel_time_t shm_atime; /* last attach time */ 28 __kernel_time_t shm_atime; /* last attach time */
21#ifdef __i386__ 29#if __BITS_PER_LONG != 64
22 unsigned long __unused1; 30 unsigned long __unused1;
23#endif 31#endif
24 __kernel_time_t shm_dtime; /* last detach time */ 32 __kernel_time_t shm_dtime; /* last detach time */
25#ifdef __i386__ 33#if __BITS_PER_LONG != 64
26 unsigned long __unused2; 34 unsigned long __unused2;
27#endif 35#endif
28 __kernel_time_t shm_ctime; /* last change time */ 36 __kernel_time_t shm_ctime; /* last change time */
29#ifdef __i386__ 37#if __BITS_PER_LONG != 64
30 unsigned long __unused3; 38 unsigned long __unused3;
31#endif 39#endif
32 __kernel_pid_t shm_cpid; /* pid of creator */ 40 __kernel_pid_t shm_cpid; /* pid of creator */
@@ -48,4 +56,4 @@ struct shminfo64 {
48 unsigned long __unused4; 56 unsigned long __unused4;
49}; 57};
50 58
51#endif /* _ASM_X86_SHMBUF_H */ 59#endif /* __ASM_GENERIC_SHMBUF_H */
diff --git a/arch/x86/include/asm/socket.h b/arch/x86/include/asm/socket.h
index ca8bf2cd0ba9..d4ae42a06a20 100644
--- a/arch/x86/include/asm/socket.h
+++ b/arch/x86/include/asm/socket.h
@@ -1,5 +1,5 @@
1#ifndef _ASM_X86_SOCKET_H 1#ifndef __ASM_GENERIC_SOCKET_H
2#define _ASM_X86_SOCKET_H 2#define __ASM_GENERIC_SOCKET_H
3 3
4#include <asm/sockios.h> 4#include <asm/sockios.h>
5 5
@@ -38,8 +38,8 @@
38#define SO_BINDTODEVICE 25 38#define SO_BINDTODEVICE 25
39 39
40/* Socket filtering */ 40/* Socket filtering */
41#define SO_ATTACH_FILTER 26 41#define SO_ATTACH_FILTER 26
42#define SO_DETACH_FILTER 27 42#define SO_DETACH_FILTER 27
43 43
44#define SO_PEERNAME 28 44#define SO_PEERNAME 28
45#define SO_TIMESTAMP 29 45#define SO_TIMESTAMP 29
@@ -57,4 +57,4 @@
57#define SO_TIMESTAMPING 37 57#define SO_TIMESTAMPING 37
58#define SCM_TIMESTAMPING SO_TIMESTAMPING 58#define SCM_TIMESTAMPING SO_TIMESTAMPING
59 59
60#endif /* _ASM_X86_SOCKET_H */ 60#endif /* __ASM_GENERIC_SOCKET_H */
diff --git a/arch/x86/include/asm/sockios.h b/arch/x86/include/asm/sockios.h
index 49cc72b5d3c9..9a61a369b901 100644
--- a/arch/x86/include/asm/sockios.h
+++ b/arch/x86/include/asm/sockios.h
@@ -1,5 +1,5 @@
1#ifndef _ASM_X86_SOCKIOS_H 1#ifndef __ASM_GENERIC_SOCKIOS_H
2#define _ASM_X86_SOCKIOS_H 2#define __ASM_GENERIC_SOCKIOS_H
3 3
4/* Socket-level I/O control calls. */ 4/* Socket-level I/O control calls. */
5#define FIOSETOWN 0x8901 5#define FIOSETOWN 0x8901
@@ -10,4 +10,4 @@
10#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ 10#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
11#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ 11#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
12 12
13#endif /* _ASM_X86_SOCKIOS_H */ 13#endif /* __ASM_GENERIC_SOCKIOS_H */
diff --git a/arch/x86/include/asm/termbits.h b/arch/x86/include/asm/termbits.h
index af1b70ea440f..1c9773d48cb0 100644
--- a/arch/x86/include/asm/termbits.h
+++ b/arch/x86/include/asm/termbits.h
@@ -1,5 +1,5 @@
1#ifndef _ASM_X86_TERMBITS_H 1#ifndef __ASM_GENERIC_TERMBITS_H
2#define _ASM_X86_TERMBITS_H 2#define __ASM_GENERIC_TERMBITS_H
3 3
4#include <linux/posix_types.h> 4#include <linux/posix_types.h>
5 5
@@ -140,7 +140,7 @@ struct ktermios {
140#define HUPCL 0002000 140#define HUPCL 0002000
141#define CLOCAL 0004000 141#define CLOCAL 0004000
142#define CBAUDEX 0010000 142#define CBAUDEX 0010000
143#define BOTHER 0010000 /* non standard rate */ 143#define BOTHER 0010000
144#define B57600 0010001 144#define B57600 0010001
145#define B115200 0010002 145#define B115200 0010002
146#define B230400 0010003 146#define B230400 0010003
@@ -195,4 +195,4 @@ struct ktermios {
195#define TCSADRAIN 1 195#define TCSADRAIN 1
196#define TCSAFLUSH 2 196#define TCSAFLUSH 2
197 197
198#endif /* _ASM_X86_TERMBITS_H */ 198#endif /* __ASM_GENERIC_TERMBITS_H */