From: Greg Ungerer Date: Mon, 15 Oct 2012 05:19:16 +0000 (+1000) Subject: m68k: switch to using the asm-generic msgbuf.h X-Git-Tag: next-20121025~89^2~8 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b6528c802e134a2962d1bbbae83ee57f010ae9f3;p=karo-tx-linux.git m68k: switch to using the asm-generic msgbuf.h We don't need a local msgbuf.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 83fcc34db6f0..677eaced5bc5 100644 --- a/arch/m68k/include/asm/Kbuild +++ b/arch/m68k/include/asm/Kbuild @@ -20,6 +20,7 @@ generic-y += kvm_para.h generic-y += local64.h generic-y += local.h generic-y += mman.h +generic-y += msgbuf.h generic-y += mutex.h generic-y += percpu.h generic-y += resource.h diff --git a/arch/m68k/include/asm/msgbuf.h b/arch/m68k/include/asm/msgbuf.h deleted file mode 100644 index 243cb798de8f..000000000000 --- a/arch/m68k/include/asm/msgbuf.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef _M68K_MSGBUF_H -#define _M68K_MSGBUF_H - -/* - * The msqid64_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 msqid64_ds { - struct ipc64_perm msg_perm; - __kernel_time_t msg_stime; /* last msgsnd time */ - unsigned long __unused1; - __kernel_time_t msg_rtime; /* last msgrcv time */ - unsigned long __unused2; - __kernel_time_t msg_ctime; /* last change time */ - unsigned long __unused3; - unsigned long msg_cbytes; /* current number of bytes on queue */ - unsigned long msg_qnum; /* number of messages in queue */ - unsigned long msg_qbytes; /* max number of bytes on queue */ - __kernel_pid_t msg_lspid; /* pid of last msgsnd */ - __kernel_pid_t msg_lrpid; /* last receive pid */ - unsigned long __unused4; - unsigned long __unused5; -}; - -#endif /* _M68K_MSGBUF_H */