diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:21:15 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:21:15 +0900 |
| commit | b6897130f0ac8ac33043be736770eb5f58164044 (patch) | |
| tree | c922f449e0ba26e225795684f2ef46954406c7c0 /arch/powerpc/include/asm/msgbuf.h | |
| parent | b4fe19f78e84813e720d0f0482da22194a7728e3 (diff) | |
| parent | fd3bc66f1dd5d062b5f0a7afc90c69d8da5b42db (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc uapi disintegration from Benjamin Herrenschmidt.
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
UAPI: (Scripted) Disintegrate arch/powerpc/include/asm
Diffstat (limited to 'arch/powerpc/include/asm/msgbuf.h')
| -rw-r--r-- | arch/powerpc/include/asm/msgbuf.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/arch/powerpc/include/asm/msgbuf.h b/arch/powerpc/include/asm/msgbuf.h deleted file mode 100644 index dd76743c7537..000000000000 --- a/arch/powerpc/include/asm/msgbuf.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef _ASM_POWERPC_MSGBUF_H -#define _ASM_POWERPC_MSGBUF_H - -/* - * The msqid64_ds structure for the PowerPC architecture. - * Note extra padding because this structure is passed back and forth - * between kernel and user space. - */ - -struct msqid64_ds { - struct ipc64_perm msg_perm; -#ifndef __powerpc64__ - unsigned int __unused1; -#endif - __kernel_time_t msg_stime; /* last msgsnd time */ -#ifndef __powerpc64__ - unsigned int __unused2; -#endif - __kernel_time_t msg_rtime; /* last msgrcv time */ -#ifndef __powerpc64__ - unsigned int __unused3; -#endif - __kernel_time_t msg_ctime; /* last change time */ - 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 /* _ASM_POWERPC_MSGBUF_H */ |