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

Padding in the sembuf structure made conditional
as only 32 bit sparc did so.

:$ diff -u include/asm-sparc/sembuf.h include/asm-sparc64/sembuf.h
:-- include/asm-sparc/sembuf.h 2008-06-13 06:42:07.000000000 +0200
:++ include/asm-sparc64/sembuf.h 2008-06-13 06:42:07.000000000 +0200
:@@ -1,21 +1,18 @@
:-#ifndef _SPARC_SEMBUF_H
:-#define _SPARC_SEMBUF_H
:+#ifndef _SPARC64_SEMBUF_H
:+#define _SPARC64_SEMBUF_H
:
: /*
:- * The semid64_ds structure for sparc architecture.
:+ * The semid64_ds structure for sparc64 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
:+ * - 2 miscellaneous 64-bit values
:  */
:
: struct semid64_ds {
:  struct ipc64_perm sem_perm; /* permissions .. see ipc.h */
:- unsigned int __pad1;
:  __kernel_time_t sem_otime; /* last semop time */
:- unsigned int __pad2;
:  __kernel_time_t sem_ctime; /* last change time */
:  unsigned long sem_nsems; /* no. of semaphores in array */
:  unsigned long __unused1;

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