diff options
author | Greg Ungerer <gerg@uclinux.org> | 2012-10-30 16:24:33 +1000 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-11-14 08:50:55 +0100 |
commit | 8e2e7656d4fac8059e35d44b7779ce1169f1a971 (patch) | |
tree | 23edad9777cc7194514a5a8e8e92f775e1b46232 /arch/m68k/include/uapi | |
parent | 82ac6c1f06ec8e79acc87669cbc9614094ef6c69 (diff) | |
download | linux-8e2e7656d4fac8059e35d44b7779ce1169f1a971.tar.bz2 |
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: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/uapi')
-rw-r--r-- | arch/m68k/include/uapi/asm/Kbuild | 2 | ||||
-rw-r--r-- | arch/m68k/include/uapi/asm/shmbuf.h | 42 |
2 files changed, 1 insertions, 43 deletions
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 637f15a38849..151b71da8f1e 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/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/arch/m68k/include/uapi/asm/shmbuf.h b/arch/m68k/include/uapi/asm/shmbuf.h deleted file mode 100644 index f8928d62f1b7..000000000000 --- a/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 */ |