Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b74aec0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-asm-generic-for-linus' of... 

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
parents b581af51 73a2d096

arch/x86/include/asm/ioctls.h

+1 −94
Original line number Diff line number Diff line 
#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
Original line number Diff line number Diff line 
#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
Original line number Diff line number Diff line 
#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
Original line number Diff line number Diff line 
#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
Original line number Diff line number Diff line 
#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>