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

Commit 7bfd124d authored by Arnd Bergmann's avatar Arnd Bergmann Committed by H. Peter Anvin
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
LKML-Reference: <cover.1245354003.git.arnd@arndb.de>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 4adc6675

arch/x86/include/asm/ioctls.h

+28 −12
Original line number Diff line number Diff line 
#ifndef _ASM_X86_IOCTLS_H

#define _ASM_X86_IOCTLS_H

#ifndef __ASM_GENERIC_IOCTLS_H

#define __ASM_GENERIC_IOCTLS_H



#include <asm/ioctl.h>

#include <linux/ioctl.h>



/*

 * These are the most common definitions for tty ioctl numbers.

 * Most of them do not use the recommended _IOC(), but there is

 * probably some source code out there hardcoding the number,

 * so we might as well use them for all new platforms.

 *

 * The architectures that use different values here typically

 * try to be compatible with some Unix variants for the same

 * architecture.

 */



/* 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 TCSETS		0x5402

#define TCSETSW		0x5403

#define TCSETSF		0x5404

#define TCGETA		0x5405
@@ -43,7 +54,6 @@ 
#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 */
@@ -53,8 +63,7 @@ 
#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 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
@@ -76,9 +85,16 @@ 


#define TIOCMIWAIT	0x545C	/* wait for a change on serial input line(s) */

#define TIOCGICOUNT	0x545D	/* read serial port inline interrupt counts */



/*

 * some architectures define FIOQSIZE as 0x545E, which is used for

 * TIOCGHAYESESP on others

 */

#ifndef FIOQSIZE

# define TIOCGHAYESESP	0x545E  /* Get Hayes ESP configuration */

# define TIOCSHAYESESP	0x545F  /* Set Hayes ESP configuration */

# define FIOQSIZE	0x5460

#endif



/* Used for packet mode */

#define TIOCPKT_DATA		 0
@@ -91,4 +107,4 @@ 


#define TIOCSER_TEMT	0x01	/* Transmitter physically empty */



#endif /* _ASM_X86_IOCTLS_H */
 
#endif /* __ASM_GENERIC_IOCTLS_H */

arch/x86/include/asm/ipcbuf.h

+10 −5
Original line number Diff line number Diff line 
#ifndef _ASM_X86_IPCBUF_H

#define _ASM_X86_IPCBUF_H

#ifndef __ASM_GENERIC_IPCBUF_H

#define __ASM_GENERIC_IPCBUF_H



/*

 * The ipc64_perm structure for x86 architecture.

 * The generic ipc64_perm structure:

 * Note extra padding because this structure is passed back and forth

 * between kernel and user space.

 *

 * ipc64_perm was originally meant to be architecture specific, but

 * everyone just ended up making identical copies without specific

 * optimizations, so we may just as well all use the same one.

 *

 * Pad space is left for:

 * - 32-bit mode_t and seq

 * - 32-bit mode_t on architectures that only had 16 bit

 * - 32-bit seq

 * - 2 miscellaneous 32-bit values

 */
@@ -25,4 +30,4 @@ struct ipc64_perm { 
	unsigned long		__unused2;

};



#endif /* _ASM_X86_IPCBUF_H */
 
#endif /* __ASM_GENERIC_IPCBUF_H */

arch/x86/include/asm/msgbuf.h

+19 −11
Original line number Diff line number Diff line 
#ifndef _ASM_X86_MSGBUF_H

#define _ASM_X86_MSGBUF_H

#ifndef __ASM_GENERIC_MSGBUF_H

#define __ASM_GENERIC_MSGBUF_H



#include <asm/bitsperlong.h>

/*

 * The msqid64_ds structure for i386 architecture.

 * generic msqid64_ds structure.

 *

 * Note extra padding because this structure is passed back and forth

 * between kernel and user space.

 *

 * Pad space on i386 is left for:

 * msqid64_ds was originally meant to be architecture specific, but

 * everyone just ended up making identical copies without specific

 * optimizations, so we may just as well all use the same one.

 *

 * 64 bit architectures typically define a 64 bit __kernel_time_t,

 * so they do not need the first three padding words.

 * On big-endian systems, the padding is in the wrong place.

 *

 * Pad space 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__

#if __BITS_PER_LONG != 64

	unsigned long	__unused1;

#endif

	__kernel_time_t msg_rtime;	/* last msgrcv time */

#ifdef __i386__

#if __BITS_PER_LONG != 64

	unsigned long	__unused2;

#endif

	__kernel_time_t msg_ctime;	/* last change time */

#ifdef __i386__

#if __BITS_PER_LONG != 64

	unsigned long	__unused3;

#endif

	unsigned long  msg_cbytes;	/* current number of bytes on queue */
@@ -36,4 +44,4 @@ struct msqid64_ds { 
	unsigned long  __unused5;

};



#endif /* _ASM_X86_MSGBUF_H */
 
#endif /* __ASM_GENERIC_MSGBUF_H */

arch/x86/include/asm/param.h

+5 −3
Original line number Diff line number Diff line 
#ifndef _ASM_X86_PARAM_H

#define _ASM_X86_PARAM_H

#ifndef __ASM_GENERIC_PARAM_H

#define __ASM_GENERIC_PARAM_H



#ifdef __KERNEL__

# define HZ		CONFIG_HZ	/* Internal kernel timer frequency */
@@ -11,7 +11,9 @@ 
#define HZ 100

#endif



#ifndef EXEC_PAGESIZE

#define EXEC_PAGESIZE	4096

#endif



#ifndef NOGROUP

#define NOGROUP		(-1)
@@ -19,4 +21,4 @@ 


#define MAXHOSTNAMELEN	64	/* max length of hostname */



#endif /* _ASM_X86_PARAM_H */
 
#endif /* __ASM_GENERIC_PARAM_H */

arch/x86/include/asm/shmbuf.h

+18 −10
Original line number Diff line number Diff line 
#ifndef _ASM_X86_SHMBUF_H

#define _ASM_X86_SHMBUF_H

#ifndef __ASM_GENERIC_SHMBUF_H

#define __ASM_GENERIC_SHMBUF_H



#include <asm/bitsperlong.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:

 * shmid64_ds was originally meant to be architecture specific, but

 * everyone just ended up making identical copies without specific

 * optimizations, so we may just as well all use the same one.

 *

 * 64 bit architectures typically define a 64 bit __kernel_time_t,

 * so they do not need the first two padding words.

 * On big-endian systems, the padding is in the wrong place.

 *

 *

 * Pad space 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__

#if __BITS_PER_LONG != 64

	unsigned long		__unused1;

#endif

	__kernel_time_t		shm_dtime;	/* last detach time */

#ifdef __i386__

#if __BITS_PER_LONG != 64

	unsigned long		__unused2;

#endif

	__kernel_time_t		shm_ctime;	/* last change time */

#ifdef __i386__

#if __BITS_PER_LONG != 64

	unsigned long		__unused3;

#endif

	__kernel_pid_t		shm_cpid;	/* pid of creator */
@@ -48,4 +56,4 @@ struct shminfo64 { 
	unsigned long	__unused4;

};



#endif /* _ASM_X86_SHMBUF_H */
 
#endif /* __ASM_GENERIC_SHMBUF_H */