diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2012-10-30 16:24:32 +1000 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-11-14 08:50:55 +0100 |
| commit | 82ac6c1f06ec8e79acc87669cbc9614094ef6c69 (patch) | |
| tree | 57d143e7d52f1e695ef3cc48eda8c299ecb99821 | |
| parent | 316b4751c0bfcd72d68a14cce546b73131c9f188 (diff) | |
m68k: switch to using the asm-generic sembuf.h
We don't need a local sembuf.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>
| -rw-r--r-- | arch/m68k/include/uapi/asm/Kbuild | 2 | ||||
| -rw-r--r-- | arch/m68k/include/uapi/asm/sembuf.h | 25 |
2 files changed, 1 insertions, 26 deletions
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 391ff1cec195..637f15a38849 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -3,6 +3,7 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += auxvec.h generic-y += msgbuf.h +generic-y += sembuf.h header-y += a.out.h header-y += byteorder.h @@ -13,7 +14,6 @@ header-y += param.h header-y += poll.h header-y += posix_types.h header-y += ptrace.h -header-y += sembuf.h header-y += setup.h header-y += shmbuf.h header-y += sigcontext.h diff --git a/arch/m68k/include/uapi/asm/sembuf.h b/arch/m68k/include/uapi/asm/sembuf.h deleted file mode 100644 index 2308052a8c24..000000000000 --- a/arch/m68k/include/uapi/asm/sembuf.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef _M68K_SEMBUF_H -#define _M68K_SEMBUF_H - -/* - * The semid64_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 semid64_ds { - struct ipc64_perm sem_perm; /* permissions .. see ipc.h */ - __kernel_time_t sem_otime; /* last semop time */ - unsigned long __unused1; - __kernel_time_t sem_ctime; /* last change time */ - unsigned long __unused2; - unsigned long sem_nsems; /* no. of semaphores in array */ - unsigned long __unused3; - unsigned long __unused4; -}; - -#endif /* _M68K_SEMBUF_H */ |