lkml.org 
[lkml]   [2015]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 4/8] CRIS: UAPI: use generic sembuf.h
Date
CRIS's sembuf.h is equivalent to the asm-generic version.
Effective diff:

-#ifndef _CRIS_SEMBUF_H
-#define _CRIS_SEMBUF_H
+#ifndef __ASM_GENERIC_SEMBUF_H
+#define __ASM_GENERIC_SEMBUF_H

+#include <asm/bitsperlong.h>

struct semid64_ds {
struct ipc64_perm sem_perm;
__kernel_time_t sem_otime;
+#if __BITS_PER_LONG != 64
unsigned long __unused1;
+#endif
__kernel_time_t sem_ctime;
+#if __BITS_PER_LONG != 64
unsigned long __unused2;
+#endif
unsigned long sem_nsems;
unsigned long __unused3;
unsigned long __unused4;

Signed-off-by: Rabin Vincent <rabin@rab.in>
---
arch/cris/include/asm/Kbuild | 1 +
arch/cris/include/uapi/asm/sembuf.h | 25 -------------------------
2 files changed, 1 insertion(+), 25 deletions(-)
delete mode 100644 arch/cris/include/uapi/asm/sembuf.h

diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index a17fb8c..8a7e8ee 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -32,6 +32,7 @@ generic-y += preempt.h
generic-y += resource.h
generic-y += scatterlist.h
generic-y += sections.h
+generic-y += sembuf.h
generic-y += siginfo.h
generic-y += sockios.h
generic-y += statfs.h
diff --git a/arch/cris/include/uapi/asm/sembuf.h b/arch/cris/include/uapi/asm/sembuf.h
deleted file mode 100644
index 7fed984..0000000
--- a/arch/cris/include/uapi/asm/sembuf.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _CRIS_SEMBUF_H
-#define _CRIS_SEMBUF_H
-
-/*
- * The semid64_ds structure for CRIS 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 /* _CRIS_SEMBUF_H */
--
2.1.4


\
 
 \ /
  Last update: 2015-05-14 18:01    [W:0.058 / U:0.492 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site