Commit 8e2e7656 authored by Greg Ungerer's avatar Greg Ungerer Committed by Geert Uytterhoeven
Browse files

m68k: switch to using the asm-generic shmbuf.h 



We don't need a local shmbuf.h, switch to using the asm-generic version.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 82ac6c1f

arch/m68k/include/uapi/asm/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ include include/uapi/asm-generic/Kbuild.asm 
generic-y += auxvec.h

generic-y += msgbuf.h

generic-y += sembuf.h

generic-y += shmbuf.h



header-y += a.out.h

header-y += byteorder.h
@@ -15,7 +16,6 @@ header-y += poll.h 
header-y += posix_types.h

header-y += ptrace.h

header-y += setup.h

header-y += shmbuf.h

header-y += sigcontext.h

header-y += signal.h

header-y += socket.h

arch/m68k/include/uapi/asm/shmbuf.h

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

#define _M68K_SHMBUF_H



/*

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