-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'x86-asm-generic-for-linus' of git://git.kernel.org/pub/…
…scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: remove all now-duplicate header files x86: convert termios.h to the asm-generic version x86: convert almost generic headers to asm-generic version x86: convert trivial headers to asm-generic version x86: add copies of some headers to convert to asm-generic
- Loading branch information
Showing
14 changed files
with
15 additions
and
687 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,94 +1 @@ | ||
| #ifndef _ASM_X86_IOCTLS_H | ||
| #define _ASM_X86_IOCTLS_H | ||
|
|
||
| #include <asm/ioctl.h> | ||
|
|
||
| /* 0x54 is just a magic number to make these relatively unique ('T') */ | ||
|
|
||
| #define TCGETS 0x5401 | ||
| #define TCSETS 0x5402 /* Clashes with SNDCTL_TMR_START sound ioctl */ | ||
| #define TCSETSW 0x5403 | ||
| #define TCSETSF 0x5404 | ||
| #define TCGETA 0x5405 | ||
| #define TCSETA 0x5406 | ||
| #define TCSETAW 0x5407 | ||
| #define TCSETAF 0x5408 | ||
| #define TCSBRK 0x5409 | ||
| #define TCXONC 0x540A | ||
| #define TCFLSH 0x540B | ||
| #define TIOCEXCL 0x540C | ||
| #define TIOCNXCL 0x540D | ||
| #define TIOCSCTTY 0x540E | ||
| #define TIOCGPGRP 0x540F | ||
| #define TIOCSPGRP 0x5410 | ||
| #define TIOCOUTQ 0x5411 | ||
| #define TIOCSTI 0x5412 | ||
| #define TIOCGWINSZ 0x5413 | ||
| #define TIOCSWINSZ 0x5414 | ||
| #define TIOCMGET 0x5415 | ||
| #define TIOCMBIS 0x5416 | ||
| #define TIOCMBIC 0x5417 | ||
| #define TIOCMSET 0x5418 | ||
| #define TIOCGSOFTCAR 0x5419 | ||
| #define TIOCSSOFTCAR 0x541A | ||
| #define FIONREAD 0x541B | ||
| #define TIOCINQ FIONREAD | ||
| #define TIOCLINUX 0x541C | ||
| #define TIOCCONS 0x541D | ||
| #define TIOCGSERIAL 0x541E | ||
| #define TIOCSSERIAL 0x541F | ||
| #define TIOCPKT 0x5420 | ||
| #define FIONBIO 0x5421 | ||
| #define TIOCNOTTY 0x5422 | ||
| #define TIOCSETD 0x5423 | ||
| #define TIOCGETD 0x5424 | ||
| #define TCSBRKP 0x5425 /* Needed for POSIX tcsendbreak() */ | ||
| /* #define TIOCTTYGSTRUCT 0x5426 - Former debugging-only ioctl */ | ||
| #define TIOCSBRK 0x5427 /* BSD compatibility */ | ||
| #define TIOCCBRK 0x5428 /* BSD compatibility */ | ||
| #define TIOCGSID 0x5429 /* Return the session ID of FD */ | ||
| #define TCGETS2 _IOR('T', 0x2A, struct termios2) | ||
| #define TCSETS2 _IOW('T', 0x2B, struct termios2) | ||
| #define TCSETSW2 _IOW('T', 0x2C, struct termios2) | ||
| #define TCSETSF2 _IOW('T', 0x2D, struct termios2) | ||
| #define TIOCGRS485 0x542E | ||
| #define TIOCSRS485 0x542F | ||
| #define TIOCGPTN _IOR('T', 0x30, unsigned int) | ||
| /* Get Pty Number (of pty-mux device) */ | ||
| #define TIOCSPTLCK _IOW('T', 0x31, int) /* Lock/unlock Pty */ | ||
| #define TCGETX 0x5432 /* SYS5 TCGETX compatibility */ | ||
| #define TCSETX 0x5433 | ||
| #define TCSETXF 0x5434 | ||
| #define TCSETXW 0x5435 | ||
|
|
||
| #define FIONCLEX 0x5450 | ||
| #define FIOCLEX 0x5451 | ||
| #define FIOASYNC 0x5452 | ||
| #define TIOCSERCONFIG 0x5453 | ||
| #define TIOCSERGWILD 0x5454 | ||
| #define TIOCSERSWILD 0x5455 | ||
| #define TIOCGLCKTRMIOS 0x5456 | ||
| #define TIOCSLCKTRMIOS 0x5457 | ||
| #define TIOCSERGSTRUCT 0x5458 /* For debugging only */ | ||
| #define TIOCSERGETLSR 0x5459 /* Get line status register */ | ||
| #define TIOCSERGETMULTI 0x545A /* Get multiport config */ | ||
| #define TIOCSERSETMULTI 0x545B /* Set multiport config */ | ||
|
|
||
| #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ | ||
| #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ | ||
| #define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ | ||
| #define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ | ||
| #define FIOQSIZE 0x5460 | ||
|
|
||
| /* Used for packet mode */ | ||
| #define TIOCPKT_DATA 0 | ||
| #define TIOCPKT_FLUSHREAD 1 | ||
| #define TIOCPKT_FLUSHWRITE 2 | ||
| #define TIOCPKT_STOP 4 | ||
| #define TIOCPKT_START 8 | ||
| #define TIOCPKT_NOSTOP 16 | ||
| #define TIOCPKT_DOSTOP 32 | ||
|
|
||
| #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ | ||
|
|
||
| #endif /* _ASM_X86_IOCTLS_H */ | ||
| #include <asm-generic/ioctls.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1 @@ | ||
| #ifndef _ASM_X86_IPCBUF_H | ||
| #define _ASM_X86_IPCBUF_H | ||
|
|
||
| /* | ||
| * The ipc64_perm structure for x86 architecture. | ||
| * Note extra padding because this structure is passed back and forth | ||
| * between kernel and user space. | ||
| * | ||
| * Pad space is left for: | ||
| * - 32-bit mode_t and seq | ||
| * - 2 miscellaneous 32-bit values | ||
| */ | ||
|
|
||
| struct ipc64_perm { | ||
| __kernel_key_t key; | ||
| __kernel_uid32_t uid; | ||
| __kernel_gid32_t gid; | ||
| __kernel_uid32_t cuid; | ||
| __kernel_gid32_t cgid; | ||
| __kernel_mode_t mode; | ||
| unsigned short __pad1; | ||
| unsigned short seq; | ||
| unsigned short __pad2; | ||
| unsigned long __unused1; | ||
| unsigned long __unused2; | ||
| }; | ||
|
|
||
| #endif /* _ASM_X86_IPCBUF_H */ | ||
| #include <asm-generic/ipcbuf.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,8 @@ | ||
| #ifndef _ASM_X86_MMAN_H | ||
| #define _ASM_X86_MMAN_H | ||
|
|
||
| #include <asm-generic/mman-common.h> | ||
|
|
||
| #define MAP_32BIT 0x40 /* only give out 32bit addresses */ | ||
|
|
||
| #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | ||
| #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | ||
| #define MAP_EXECUTABLE 0x1000 /* mark it as an executable */ | ||
| #define MAP_LOCKED 0x2000 /* pages are locked */ | ||
| #define MAP_NORESERVE 0x4000 /* don't check for reservations */ | ||
| #define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */ | ||
| #define MAP_NONBLOCK 0x10000 /* do not block on IO */ | ||
| #define MAP_STACK 0x20000 /* give out an address that is best suited for process/thread stacks */ | ||
|
|
||
| #define MCL_CURRENT 1 /* lock all current mappings */ | ||
| #define MCL_FUTURE 2 /* lock all future mappings */ | ||
| #include <asm-generic/mman.h> | ||
|
|
||
| #endif /* _ASM_X86_MMAN_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1 @@ | ||
| #ifndef _ASM_X86_MSGBUF_H | ||
| #define _ASM_X86_MSGBUF_H | ||
|
|
||
| /* | ||
| * The msqid64_ds structure for i386 architecture. | ||
| * Note extra padding because this structure is passed back and forth | ||
| * between kernel and user space. | ||
| * | ||
| * Pad space on i386 is left for: | ||
| * - 64-bit time_t to solve y2038 problem | ||
| * - 2 miscellaneous 32-bit values | ||
| * | ||
| * Pad space on x8664 is left for: | ||
| * - 2 miscellaneous 64-bit values | ||
| */ | ||
| struct msqid64_ds { | ||
| struct ipc64_perm msg_perm; | ||
| __kernel_time_t msg_stime; /* last msgsnd time */ | ||
| #ifdef __i386__ | ||
| unsigned long __unused1; | ||
| #endif | ||
| __kernel_time_t msg_rtime; /* last msgrcv time */ | ||
| #ifdef __i386__ | ||
| unsigned long __unused2; | ||
| #endif | ||
| __kernel_time_t msg_ctime; /* last change time */ | ||
| #ifdef __i386__ | ||
| unsigned long __unused3; | ||
| #endif | ||
| unsigned long msg_cbytes; /* current number of bytes on queue */ | ||
| unsigned long msg_qnum; /* number of messages in queue */ | ||
| unsigned long msg_qbytes; /* max number of bytes on queue */ | ||
| __kernel_pid_t msg_lspid; /* pid of last msgsnd */ | ||
| __kernel_pid_t msg_lrpid; /* last receive pid */ | ||
| unsigned long __unused4; | ||
| unsigned long __unused5; | ||
| }; | ||
|
|
||
| #endif /* _ASM_X86_MSGBUF_H */ | ||
| #include <asm-generic/msgbuf.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1 @@ | ||
| #ifndef _ASM_X86_PARAM_H | ||
| #define _ASM_X86_PARAM_H | ||
|
|
||
| #ifdef __KERNEL__ | ||
| # define HZ CONFIG_HZ /* Internal kernel timer frequency */ | ||
| # define USER_HZ 100 /* some user interfaces are */ | ||
| # define CLOCKS_PER_SEC (USER_HZ) /* in "ticks" like times() */ | ||
| #endif | ||
|
|
||
| #ifndef HZ | ||
| #define HZ 100 | ||
| #endif | ||
|
|
||
| #define EXEC_PAGESIZE 4096 | ||
|
|
||
| #ifndef NOGROUP | ||
| #define NOGROUP (-1) | ||
| #endif | ||
|
|
||
| #define MAXHOSTNAMELEN 64 /* max length of hostname */ | ||
|
|
||
| #endif /* _ASM_X86_PARAM_H */ | ||
| #include <asm-generic/param.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,8 @@ | ||
| #ifndef _ASM_X86_SCATTERLIST_H | ||
| #define _ASM_X86_SCATTERLIST_H | ||
|
|
||
| #include <asm/types.h> | ||
|
|
||
| struct scatterlist { | ||
| #ifdef CONFIG_DEBUG_SG | ||
| unsigned long sg_magic; | ||
| #endif | ||
| unsigned long page_link; | ||
| unsigned int offset; | ||
| unsigned int length; | ||
| dma_addr_t dma_address; | ||
| unsigned int dma_length; | ||
| }; | ||
|
|
||
| #define ARCH_HAS_SG_CHAIN | ||
| #define ISA_DMA_THRESHOLD (0x00ffffff) | ||
|
|
||
| /* | ||
| * These macros should be used after a pci_map_sg call has been done | ||
| * to get bus addresses of each of the SG entries and their lengths. | ||
| * You should only work with the number of sg entries pci_map_sg | ||
| * returns. | ||
| */ | ||
| #define sg_dma_address(sg) ((sg)->dma_address) | ||
| #ifdef CONFIG_X86_32 | ||
| # define sg_dma_len(sg) ((sg)->length) | ||
| #else | ||
| # define sg_dma_len(sg) ((sg)->dma_length) | ||
| #endif | ||
| #include <asm-generic/scatterlist.h> | ||
|
|
||
| #endif /* _ASM_X86_SCATTERLIST_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,51 +1 @@ | ||
| #ifndef _ASM_X86_SHMBUF_H | ||
| #define _ASM_X86_SHMBUF_H | ||
|
|
||
| /* | ||
| * The shmid64_ds structure for x86 architecture. | ||
| * Note extra padding because this structure is passed back and forth | ||
| * between kernel and user space. | ||
| * | ||
| * Pad space on 32 bit is left for: | ||
| * - 64-bit time_t to solve y2038 problem | ||
| * - 2 miscellaneous 32-bit values | ||
| * | ||
| * Pad space on 64 bit is left for: | ||
| * - 2 miscellaneous 64-bit values | ||
| */ | ||
|
|
||
| struct shmid64_ds { | ||
| struct ipc64_perm shm_perm; /* operation perms */ | ||
| size_t shm_segsz; /* size of segment (bytes) */ | ||
| __kernel_time_t shm_atime; /* last attach time */ | ||
| #ifdef __i386__ | ||
| unsigned long __unused1; | ||
| #endif | ||
| __kernel_time_t shm_dtime; /* last detach time */ | ||
| #ifdef __i386__ | ||
| unsigned long __unused2; | ||
| #endif | ||
| __kernel_time_t shm_ctime; /* last change time */ | ||
| #ifdef __i386__ | ||
| unsigned long __unused3; | ||
| #endif | ||
| __kernel_pid_t shm_cpid; /* pid of creator */ | ||
| __kernel_pid_t shm_lpid; /* pid of last operator */ | ||
| unsigned long shm_nattch; /* no. of current attaches */ | ||
| unsigned long __unused4; | ||
| unsigned long __unused5; | ||
| }; | ||
|
|
||
| struct shminfo64 { | ||
| unsigned long shmmax; | ||
| unsigned long shmmin; | ||
| unsigned long shmmni; | ||
| unsigned long shmseg; | ||
| unsigned long shmall; | ||
| unsigned long __unused1; | ||
| unsigned long __unused2; | ||
| unsigned long __unused3; | ||
| unsigned long __unused4; | ||
| }; | ||
|
|
||
| #endif /* _ASM_X86_SHMBUF_H */ | ||
| #include <asm-generic/shmbuf.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1 @@ | ||
| #ifndef _ASM_X86_SOCKET_H | ||
| #define _ASM_X86_SOCKET_H | ||
|
|
||
| #include <asm/sockios.h> | ||
|
|
||
| /* For setsockopt(2) */ | ||
| #define SOL_SOCKET 1 | ||
|
|
||
| #define SO_DEBUG 1 | ||
| #define SO_REUSEADDR 2 | ||
| #define SO_TYPE 3 | ||
| #define SO_ERROR 4 | ||
| #define SO_DONTROUTE 5 | ||
| #define SO_BROADCAST 6 | ||
| #define SO_SNDBUF 7 | ||
| #define SO_RCVBUF 8 | ||
| #define SO_SNDBUFFORCE 32 | ||
| #define SO_RCVBUFFORCE 33 | ||
| #define SO_KEEPALIVE 9 | ||
| #define SO_OOBINLINE 10 | ||
| #define SO_NO_CHECK 11 | ||
| #define SO_PRIORITY 12 | ||
| #define SO_LINGER 13 | ||
| #define SO_BSDCOMPAT 14 | ||
| /* To add :#define SO_REUSEPORT 15 */ | ||
| #define SO_PASSCRED 16 | ||
| #define SO_PEERCRED 17 | ||
| #define SO_RCVLOWAT 18 | ||
| #define SO_SNDLOWAT 19 | ||
| #define SO_RCVTIMEO 20 | ||
| #define SO_SNDTIMEO 21 | ||
|
|
||
| /* Security levels - as per NRL IPv6 - don't actually do anything */ | ||
| #define SO_SECURITY_AUTHENTICATION 22 | ||
| #define SO_SECURITY_ENCRYPTION_TRANSPORT 23 | ||
| #define SO_SECURITY_ENCRYPTION_NETWORK 24 | ||
|
|
||
| #define SO_BINDTODEVICE 25 | ||
|
|
||
| /* Socket filtering */ | ||
| #define SO_ATTACH_FILTER 26 | ||
| #define SO_DETACH_FILTER 27 | ||
|
|
||
| #define SO_PEERNAME 28 | ||
| #define SO_TIMESTAMP 29 | ||
| #define SCM_TIMESTAMP SO_TIMESTAMP | ||
|
|
||
| #define SO_ACCEPTCONN 30 | ||
|
|
||
| #define SO_PEERSEC 31 | ||
| #define SO_PASSSEC 34 | ||
| #define SO_TIMESTAMPNS 35 | ||
| #define SCM_TIMESTAMPNS SO_TIMESTAMPNS | ||
|
|
||
| #define SO_MARK 36 | ||
|
|
||
| #define SO_TIMESTAMPING 37 | ||
| #define SCM_TIMESTAMPING SO_TIMESTAMPING | ||
|
|
||
| #endif /* _ASM_X86_SOCKET_H */ | ||
| #include <asm-generic/socket.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1 @@ | ||
| #ifndef _ASM_X86_SOCKIOS_H | ||
| #define _ASM_X86_SOCKIOS_H | ||
|
|
||
| /* Socket-level I/O control calls. */ | ||
| #define FIOSETOWN 0x8901 | ||
| #define SIOCSPGRP 0x8902 | ||
| #define FIOGETOWN 0x8903 | ||
| #define SIOCGPGRP 0x8904 | ||
| #define SIOCATMARK 0x8905 | ||
| #define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ | ||
| #define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ | ||
|
|
||
| #endif /* _ASM_X86_SOCKIOS_H */ | ||
| #include <asm-generic/sockios.h> |
Oops, something went wrong.