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

Commit 079091a4 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: merge shmbuf_32/64.h 



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

include/asm-x86/Kbuild

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ unifdef-y += posix_types_64.h 
unifdef-y += ptrace.h

unifdef-y += setup_32.h

unifdef-y += setup_64.h

unifdef-y += shmbuf_32.h

unifdef-y += shmbuf_64.h

unifdef-y += sigcontext_32.h

unifdef-y += sigcontext_64.h

unifdef-y += signal_32.h

include/asm-x86/shmbuf.h

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

# ifdef CONFIG_X86_32

#  include "shmbuf_32.h"

# else

#  include "shmbuf_64.h"

#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

#else

	__kernel_time_t		shm_dtime;	/* last detach time */

#ifdef __i386__

#  include "shmbuf_32.h"

# else

#  include "shmbuf_64.h"

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

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
#ifndef _I386_SHMBUF_H

#define _I386_SHMBUF_H



/* 

 * The shmid64_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 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 */

	unsigned long		__unused1;

	__kernel_time_t		shm_dtime;	/* last detach time */

	unsigned long		__unused2;

	__kernel_time_t		shm_ctime;	/* last change time */

	unsigned long		__unused3;

	__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 /* _I386_SHMBUF_H */

include/asm-x86/shmbuf_64.h

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
#ifndef _X8664_SHMBUF_H

#define _X8664_SHMBUF_H



/* 

 * The shmid64_ds structure for x8664 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 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 */

	__kernel_time_t		shm_dtime;	/* last detach time */

	__kernel_time_t		shm_ctime;	/* last change time */

	__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