sparc: Merge asm-sparc{,64}/sembuf.h

[karo-tx-linux.git] / include / asm-sparc / sembuf.h

diff --git a/include/asm-sparc/sembuf.h b/include/asm-sparc/sembuf.h
index a79c4bb3c08ac6205413b62e7bbbee599b43bd49..faee1be08d67b223deef379a411df0ec40f51fbe 100644 (file)
--- a/include/asm-sparc/sembuf.h
+++ b/include/asm-sparc/sembuf.h
@@ -1,7 +1,7 @@
 #ifndef _SPARC_SEMBUF_H
 #define _SPARC_SEMBUF_H
 
-/* 
+/*
  * The semid64_ds structure for sparc architecture.
  * Note extra padding because this structure is passed back and forth
  * between kernel and user space.
@@ -10,16 +10,22 @@
  * - 64-bit time_t to solve y2038 problem
  * - 2 miscellaneous 32-bit values
  */
+#if defined(__sparc__) && defined(__arch64__)
+# define PADDING(x)
+#else
+# define PADDING(x) unsigned int x;
+#endif
 
 struct semid64_ds {
        struct ipc64_perm sem_perm;             /* permissions .. see ipc.h */
-       unsigned int    __pad1;
+       PADDING(__pad1)
        __kernel_time_t sem_otime;              /* last semop time */
-       unsigned int    __pad2;
+       PADDING(__pad2)
        __kernel_time_t sem_ctime;              /* last change time */
        unsigned long   sem_nsems;              /* no. of semaphores in array */
        unsigned long   __unused1;
        unsigned long   __unused2;
 };
+#undef PADDING
 
 #endif /* _SPARC64_SEMBUF_H */