X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Fasm-x86%2Fsembuf.h;h=ee50c801f7b7eda1d4ea2aeea1f99cfaf1b03ccd;hb=7462894a7cb03b54b9139f31fab5928366752a78;hp=e42c971e383fdf4f28c86c78029ae675b35e4a7a;hpb=1ce48904285fe4b0298864f9153a8502ebeac35c;p=powerpc.git

diff --git a/include/asm-x86/sembuf.h b/include/asm-x86/sembuf.h
index e42c971e38..ee50c801f7 100644
--- a/include/asm-x86/sembuf.h
+++ b/include/asm-x86/sembuf.h
@@ -1,13 +1,24 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-#  include "sembuf_32.h"
-# else
-#  include "sembuf_64.h"
-# endif
-#else
-# ifdef __i386__
-#  include "sembuf_32.h"
-# else
-#  include "sembuf_64.h"
-# endif
-#endif
+#ifndef _ASM_X86_SEMBUF_H
+#define _ASM_X86_SEMBUF_H
+
+/*
+ * The semid64_ds structure for x86 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
+ */
+struct semid64_ds {
+	struct ipc64_perm sem_perm;	/* permissions .. see ipc.h */
+	__kernel_time_t	sem_otime;	/* last semop time */
+	unsigned long	__unused1;
+	__kernel_time_t	sem_ctime;	/* last change time */
+	unsigned long	__unused2;
+	unsigned long	sem_nsems;	/* no. of semaphores in array */
+	unsigned long	__unused3;
+	unsigned long	__unused4;
+};
+
+#endif /* _ASM_X86_SEMBUF_H */