From: Greg Ungerer Date: Mon, 15 Oct 2012 05:40:35 +0000 (+1000) Subject: m68k: switch to using the asm-generic sembuf.h X-Git-Tag: next-20121025~89^2~6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c5f39c6f9cf75ce7ede5849fa8c1ff4bae151ecb;p=karo-tx-linux.git 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 --- diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild index 775eef96d70a..19f59dcf4c02 100644 --- a/arch/m68k/include/asm/Kbuild +++ b/arch/m68k/include/asm/Kbuild @@ -26,6 +26,7 @@ generic-y += percpu.h generic-y += resource.h generic-y += scatterlist.h generic-y += sections.h +generic-y += sembuf.h generic-y += shmbuf.h generic-y += shmparam.h generic-y += siginfo.h diff --git a/arch/m68k/include/asm/sembuf.h b/arch/m68k/include/asm/sembuf.h deleted file mode 100644 index 2308052a8c24..000000000000 --- a/arch/m68k/include/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 */