]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
sparc: Merge asm-sparc{,64}/msgbuf.h
authorSam Ravnborg <sam@ravnborg.org>
Thu, 5 Jun 2008 21:04:06 +0000 (23:04 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Jul 2008 04:41:42 +0000 (21:41 -0700)
commit100b10d752bafafda2a508235b7df6718e42bd76
tree5c45cb08f25698bd2292b107d5fa2832878b4ab5
parent6d1f4b88ee73c9a073277dd1529fbbce356e04e8
sparc: Merge asm-sparc{,64}/msgbuf.h

Padding from 32 bit sparc kept using preprocessor magic

:$ diff -u include/asm-sparc/msgbuf.h include/asm-sparc64/msgbuf.h
:-- include/asm-sparc/msgbuf.h 2008-06-13 06:42:07.000000000 +0200
:++ include/asm-sparc64/msgbuf.h 2008-06-13 06:42:07.000000000 +0200
:@@ -7,17 +7,13 @@
:  * between kernel and user space.
:  *
:  * Pad space is left for:
:- * - 64-bit time_t to solve y2038 problem
:- * - 2 miscellaneous 32-bit values
:+ * - 2 miscellaneous 64-bit values
:  */
:
: struct msqid64_ds {
:  struct ipc64_perm msg_perm;
:- unsigned int   __pad1;
:  __kernel_time_t msg_stime; /* last msgsnd time */
:- unsigned int   __pad2;
:  __kernel_time_t msg_rtime; /* last msgrcv time */
:- unsigned int   __pad3;
:  __kernel_time_t msg_ctime; /* last change time */
:  unsigned long  msg_cbytes; /* current number of bytes on queue */

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
include/asm-sparc/msgbuf.h
include/asm-sparc64/msgbuf.h