x86/asm-generic for v2.6.32
Linus,
Please pull the x86-asm-generic-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-asm-generic-for-linus
Thanks,
Ingo
------------------>
Arnd Bergmann (5):
x86: add copies of some headers to convert to asm-generic
x86: convert trivial headers to asm-generic version
x86: convert almost generic headers to asm-generic version
x86: convert termios.h to the asm-generic version
x86: remove all now-duplicate header files
arch/x86/include/asm/ioctls.h | 95 +----------------- arch/x86/include/asm/ipcbuf.h | 29 +----- arch/x86/include/asm/mman.h | 14 +--- arch/x86/include/asm/module.h | 13 +-- arch/x86/include/asm/msgbuf.h | 40 +------- arch/x86/include/asm/param.h | 23 +---- arch/x86/include/asm/scatterlist.h | 27 +----- arch/x86/include/asm/shmbuf.h | 52 +--------- arch/x86/include/asm/socket.h | 61 +----------- arch/x86/include/asm/sockios.h | 14 +--- arch/x86/include/asm/termbits.h | 199 +----------------------------------- arch/x86/include/asm/termios.h | 115 +-------------------- arch/x86/include/asm/types.h | 12 +-- arch/x86/include/asm/ucontext.h | 8 +-- 14 files changed, 15 insertions(+), 687 deletions(-)
arch/x86/include/asm/ioctls.h +1 -94
@@ -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>
arch/x86/include/asm/ipcbuf.h +1 -28
@@ -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>
arch/x86/include/asm/mman.h +1 -13
@@ -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 */
arch/x86/include/asm/module.h +1 -12
@@ -1,18 +1,7 @@#ifndef _ASM_X86_MODULE_H#define _ASM_X86_MODULE_H -/* x86_32/64 are simple */ -struct mod_arch_specific {}; - -#ifdef CONFIG_X86_32 -# define Elf_Shdr Elf32_Shdr -# define Elf_Sym Elf32_Sym -# define Elf_Ehdr Elf32_Ehdr -#else -# define Elf_Shdr Elf64_Shdr -# define Elf_Sym Elf64_Sym -# define Elf_Ehdr Elf64_Ehdr -#endif +#include <asm-generic/module.h> #ifdef CONFIG_X86_64 /* X86_64 does not define MODULE_PROC_FAMILY */
arch/x86/include/asm/msgbuf.h +1 -39
@@ -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>
arch/x86/include/asm/param.h +1 -22
@@ -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>
arch/x86/include/asm/scatterlist.h +1 -26
@@ -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 */
arch/x86/include/asm/shmbuf.h +1 -51
52 lines not on this page · raw message
arch/x86/include/asm/socket.h +1 -60
61 lines not on this page · raw message
arch/x86/include/asm/sockios.h +1 -13
@@ -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>
arch/x86/include/asm/termbits.h +1 -198
199 lines not on this page · raw message
arch/x86/include/asm/termios.h +1 -114
115 lines not on this page · raw message
arch/x86/include/asm/types.h +2 -10
@@ -1,19 +1,11 @@#ifndef _ASM_X86_TYPES_H#define _ASM_X86_TYPES_H -#include <asm-generic/int-ll64.h> +#define dma_addr_t dma_addr_t -#ifndef __ASSEMBLY__ - -typedef unsigned short umode_t ; +#include <asm-generic/types.h> -#endif /* __ASSEMBLY__ */ - -/* -* These aren't exported outside the kernel to avoid name space clashes -*/ #ifdef __KERNEL__ -#ifndef __ASSEMBLY__typedef u64 dma64_addr_t ;
arch/x86/include/asm/ucontext.h +1 -7
@@ -7,12 +7,6 @@* sigcontext struct (uc_mcontext). */ -struct ucontext { -unsigned long uc_flags; -struct ucontext *uc_link; -stack_t uc_stack; -struct sigcontext uc_mcontext; -sigset_t uc_sigmask;/* mask last for extensibility */ -}; +#include <asm-generic/ucontext.h> #endif /* _ASM_X86_UCONTEXT_H */