From 7906fb479b66217f590d82b437dd5357c1fc2fab Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Thu, 5 Jun 2008 23:39:32 +0200
Subject: [PATCH] --- yaml --- r: 104153 b: refs/heads/master c:
 fcb07081f209d3d9c7662ba6a097b254e76f71ee h: refs/heads/master i:   104151:
 fc9c5ba631f23c7cea70da4ca78c12017df4feef v: v3

---
 [refs]                             |  2 +-
 trunk/include/asm-sparc/sembuf.h   | 12 +++++++++---
 trunk/include/asm-sparc64/sembuf.h | 23 +----------------------
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index 4219873c6e50..7b264834fb64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 100b10d752bafafda2a508235b7df6718e42bd76
+refs/heads/master: fcb07081f209d3d9c7662ba6a097b254e76f71ee
diff --git a/trunk/include/asm-sparc/sembuf.h b/trunk/include/asm-sparc/sembuf.h
index a79c4bb3c08a..faee1be08d67 100644
--- a/trunk/include/asm-sparc/sembuf.h
+++ b/trunk/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 */
diff --git a/trunk/include/asm-sparc64/sembuf.h b/trunk/include/asm-sparc64/sembuf.h
index 99f04e4e288c..c55b95214136 100644
--- a/trunk/include/asm-sparc64/sembuf.h
+++ b/trunk/include/asm-sparc64/sembuf.h
@@ -1,22 +1 @@
-#ifndef _SPARC64_SEMBUF_H
-#define _SPARC64_SEMBUF_H
-
-/* 
- * 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:
- * - 2 miscellaneous 64-bit values
- */
-
-struct semid64_ds {
-	struct ipc64_perm sem_perm;		/* permissions .. see ipc.h */
-	__kernel_time_t	sem_otime;		/* last semop time */
-	__kernel_time_t	sem_ctime;		/* last change time */
-	unsigned long	sem_nsems;		/* no. of semaphores in array */
-	unsigned long	__unused1;
-	unsigned long	__unused2;
-};
-
-#endif /* _SPARC64_SEMBUF_H */
+#include <asm-sparc/sembuf.h>