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

Commit 5ca3b0f1 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: merge msgbuf_32/64.h 



Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 2439a791

include/asm-x86/Kbuild

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ header-y += vsyscall32.h 
unifdef-y += e820.h

unifdef-y += ist.h

unifdef-y += mce.h

unifdef-y += msgbuf_32.h

unifdef-y += msgbuf_64.h

unifdef-y += msr_32.h

unifdef-y += msr_64.h

unifdef-y += msr.h

include/asm-x86/msgbuf.h

+38 −12
Original line number Diff line number Diff line 
#ifdef __KERNEL__

# ifdef CONFIG_X86_32

#  include "msgbuf_32.h"

# else

#  include "msgbuf_64.h"

#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

#else

	__kernel_time_t msg_rtime;	/* last msgrcv time */

#ifdef __i386__

#  include "msgbuf_32.h"

# else

#  include "msgbuf_64.h"

	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-x86/msgbuf_32.h

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
#ifndef _I386_MSGBUF_H

#define _I386_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 is left for:

 * - 64-bit time_t to solve y2038 problem

 * - 2 miscellaneous 32-bit values

 */



struct msqid64_ds {

	struct ipc64_perm msg_perm;

	__kernel_time_t msg_stime;	/* last msgsnd time */

	unsigned long	__unused1;

	__kernel_time_t msg_rtime;	/* last msgrcv time */

	unsigned long	__unused2;

	__kernel_time_t msg_ctime;	/* last change time */

	unsigned long	__unused3;

	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 /* _I386_MSGBUF_H */

include/asm-x86/msgbuf_64.h

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
#ifndef _X8664_MSGBUF_H

#define _X8664_MSGBUF_H



/* 

 * The msqid64_ds structure for x86-64 architecture.

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

 * between kernel and user space.

 *

 * Pad space is left for:

 * - 2 miscellaneous 64-bit values

 */



struct msqid64_ds {

	struct ipc64_perm msg_perm;

	__kernel_time_t msg_stime;	/* last msgsnd time */

	__kernel_time_t msg_rtime;	/* last msgrcv time */

	__kernel_time_t msg_ctime;	/* last change time */

	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