redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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 <gerg@uclinux.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
hifive-unleashed-5.1
Greg Ungerer 2012-10-30 16:24:31 +10:00 committed by Geert Uytterhoeven
parent b793eab1e3
commit 316b4751c0
2 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/m68k/include/uapi/asm/Kbuild
View File

@ -2,13 +2,13 @@
include include/uapi/asm-generic/Kbuild.asm
generic-y += auxvec.h
generic-y += msgbuf.h
header-y += a.out.h
header-y += byteorder.h
header-y += cachectl.h
header-y += fcntl.h
header-y += ioctls.h
header-y += msgbuf.h
header-y += param.h
header-y += poll.h
header-y += posix_types.h

31
arch/m68k/include/uapi/asm/msgbuf.h
View File

@ -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 */