From d4e64dbc7dc4bb481b856339949f69b15cdc3b8c Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Tue, 30 Oct 2012 16:24:33 +1000 Subject: [PATCH] --- yaml --- r: 343367 b: refs/heads/master c: 8e2e7656d4fac8059e35d44b7779ce1169f1a971 h: refs/heads/master i: 343365: fe2a1ee33971289661112b832650bc9196616adf 343363: e8108a3c0a494f0b5e1e9db69483fd4943989483 343359: 80825ae16762dbbfb0274d62098d84026aa5e651 v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/uapi/asm/Kbuild | 2 +- trunk/arch/m68k/include/uapi/asm/shmbuf.h | 42 ----------------------- 3 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 trunk/arch/m68k/include/uapi/asm/shmbuf.h diff --git a/[refs] b/[refs] index 2a6080bc107b..1423021c99f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82ac6c1f06ec8e79acc87669cbc9614094ef6c69 +refs/heads/master: 8e2e7656d4fac8059e35d44b7779ce1169f1a971 diff --git a/trunk/arch/m68k/include/uapi/asm/Kbuild b/trunk/arch/m68k/include/uapi/asm/Kbuild index 637f15a38849..151b71da8f1e 100644 --- a/trunk/arch/m68k/include/uapi/asm/Kbuild +++ b/trunk/arch/m68k/include/uapi/asm/Kbuild @@ -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 diff --git a/trunk/arch/m68k/include/uapi/asm/shmbuf.h b/trunk/arch/m68k/include/uapi/asm/shmbuf.h deleted file mode 100644 index f8928d62f1b7..000000000000 --- a/trunk/arch/m68k/include/uapi/asm/shmbuf.h +++ /dev/null @@ -1,42 +0,0 @@ -#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 */