diff options
| author | jdl@freescale.com <jdl@freescale.com> | 2005-09-07 15:59:48 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-09 22:11:35 +1000 |
| commit | dd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb (patch) | |
| tree | 59f952b87d4bec5f11c578a384c3aaa2ddf5860d /include/asm-ppc/msgbuf.h | |
| parent | 64807081e38703617cf9a5d71db14ea2b3e1cb04 (diff) | |
| download | linux-stable-dd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb.tar.gz linux-stable-dd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb.tar.bz2 linux-stable-dd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb.zip | |
[PATCH] powerpc: Merge a few more include files
Merge a few asm-ppc and asm-ppc64 header files.
Note: the merge of setup.h intentionally does not carry
forward the m68k cruft. That means this patch continues
to break the already broken amiga on the ppc32.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc/msgbuf.h')
| -rw-r--r-- | include/asm-ppc/msgbuf.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/include/asm-ppc/msgbuf.h b/include/asm-ppc/msgbuf.h deleted file mode 100644 index 1053452a9376..000000000000 --- a/include/asm-ppc/msgbuf.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef _PPC_MSGBUF_H -#define _PPC_MSGBUF_H - -/* - * The msqid64_ds structure for the PPC architecture. - */ - -struct msqid64_ds { - struct ipc64_perm msg_perm; - unsigned int __unused1; - __kernel_time_t msg_stime; /* last msgsnd time */ - unsigned int __unused2; - __kernel_time_t msg_rtime; /* last msgrcv time */ - unsigned int __unused3; - __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 /* _PPC_MSGBUF_H */ |