All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/8] CRIS: UAPI: use generic headers via Kbuild
@ 2015-05-14 15:28 Rabin Vincent
  2015-05-14 15:28 ` [PATCH 2/8] CRIS: UAPI: use generic auxvec.h Rabin Vincent
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: Rabin Vincent @ 2015-05-14 15:28 UTC (permalink / raw)
  To: jesper.nilsson; +Cc: linux-kernel, linux-cris-kernel, Rabin Vincent

Use Kbuild magic to include the generic headers.

Signed-off-by: Rabin Vincent <rabin@rab.in>
---
 arch/cris/include/asm/Kbuild             | 10 ++++++++++
 arch/cris/include/uapi/asm/bitsperlong.h |  1 -
 arch/cris/include/uapi/asm/errno.h       |  6 ------
 arch/cris/include/uapi/asm/fcntl.h       |  1 -
 arch/cris/include/uapi/asm/ioctl.h       |  1 -
 arch/cris/include/uapi/asm/ipcbuf.h      |  1 -
 arch/cris/include/uapi/asm/kvm_para.h    |  1 -
 arch/cris/include/uapi/asm/mman.h        |  1 -
 arch/cris/include/uapi/asm/poll.h        |  1 -
 arch/cris/include/uapi/asm/resource.h    |  6 ------
 arch/cris/include/uapi/asm/siginfo.h     |  6 ------
 arch/cris/include/uapi/asm/statfs.h      |  6 ------
 12 files changed, 10 insertions(+), 31 deletions(-)
 delete mode 100644 arch/cris/include/uapi/asm/bitsperlong.h
 delete mode 100644 arch/cris/include/uapi/asm/errno.h
 delete mode 100644 arch/cris/include/uapi/asm/fcntl.h
 delete mode 100644 arch/cris/include/uapi/asm/ioctl.h
 delete mode 100644 arch/cris/include/uapi/asm/ipcbuf.h
 delete mode 100644 arch/cris/include/uapi/asm/kvm_para.h
 delete mode 100644 arch/cris/include/uapi/asm/mman.h
 delete mode 100644 arch/cris/include/uapi/asm/poll.h
 delete mode 100644 arch/cris/include/uapi/asm/resource.h
 delete mode 100644 arch/cris/include/uapi/asm/siginfo.h
 delete mode 100644 arch/cris/include/uapi/asm/statfs.h

diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index 057e518..c1d6da9 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -1,14 +1,19 @@
 generic-y += atomic.h
 generic-y += barrier.h
+generic-y += bitsperlong.h
 generic-y += clkdev.h
 generic-y += cmpxchg.h
 generic-y += cputime.h
 generic-y += device.h
 generic-y += div64.h
+generic-y += errno.h
 generic-y += exec.h
 generic-y += emergency-restart.h
+generic-y += fcntl.h
 generic-y += futex.h
 generic-y += hardirq.h
+generic-y += ioctl.h
+generic-y += ipcbuf.h
 generic-y += irq_regs.h
 generic-y += irq_work.h
 generic-y += kdebug.h
@@ -18,11 +23,16 @@ generic-y += linkage.h
 generic-y += local.h
 generic-y += local64.h
 generic-y += mcs_spinlock.h
+generic-y += mman.h
 generic-y += module.h
 generic-y += percpu.h
+generic-y += poll.h
 generic-y += preempt.h
+generic-y += resource.h
 generic-y += scatterlist.h
 generic-y += sections.h
+generic-y += siginfo.h
+generic-y += statfs.h
 generic-y += topology.h
 generic-y += trace_clock.h
 generic-y += vga.h
diff --git a/arch/cris/include/uapi/asm/bitsperlong.h b/arch/cris/include/uapi/asm/bitsperlong.h
deleted file mode 100644
index 6dc0bb0..0000000
--- a/arch/cris/include/uapi/asm/bitsperlong.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/bitsperlong.h>
diff --git a/arch/cris/include/uapi/asm/errno.h b/arch/cris/include/uapi/asm/errno.h
deleted file mode 100644
index 2bf5eb5..0000000
--- a/arch/cris/include/uapi/asm/errno.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _CRIS_ERRNO_H
-#define _CRIS_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif
diff --git a/arch/cris/include/uapi/asm/fcntl.h b/arch/cris/include/uapi/asm/fcntl.h
deleted file mode 100644
index 46ab12d..0000000
--- a/arch/cris/include/uapi/asm/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/arch/cris/include/uapi/asm/ioctl.h b/arch/cris/include/uapi/asm/ioctl.h
deleted file mode 100644
index b279fe0..0000000
--- a/arch/cris/include/uapi/asm/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/arch/cris/include/uapi/asm/ipcbuf.h b/arch/cris/include/uapi/asm/ipcbuf.h
deleted file mode 100644
index 84c7e51..0000000
--- a/arch/cris/include/uapi/asm/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipcbuf.h>
diff --git a/arch/cris/include/uapi/asm/kvm_para.h b/arch/cris/include/uapi/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/cris/include/uapi/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
diff --git a/arch/cris/include/uapi/asm/mman.h b/arch/cris/include/uapi/asm/mman.h
deleted file mode 100644
index 8eebf89..0000000
--- a/arch/cris/include/uapi/asm/mman.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/mman.h>
diff --git a/arch/cris/include/uapi/asm/poll.h b/arch/cris/include/uapi/asm/poll.h
deleted file mode 100644
index c98509d..0000000
--- a/arch/cris/include/uapi/asm/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/arch/cris/include/uapi/asm/resource.h b/arch/cris/include/uapi/asm/resource.h
deleted file mode 100644
index b5d2944..0000000
--- a/arch/cris/include/uapi/asm/resource.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _CRIS_RESOURCE_H
-#define _CRIS_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif
diff --git a/arch/cris/include/uapi/asm/siginfo.h b/arch/cris/include/uapi/asm/siginfo.h
deleted file mode 100644
index c1cd6d1..0000000
--- a/arch/cris/include/uapi/asm/siginfo.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _CRIS_SIGINFO_H
-#define _CRIS_SIGINFO_H
-
-#include <asm-generic/siginfo.h>
-
-#endif
diff --git a/arch/cris/include/uapi/asm/statfs.h b/arch/cris/include/uapi/asm/statfs.h
deleted file mode 100644
index fdaf921..0000000
--- a/arch/cris/include/uapi/asm/statfs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _CRIS_STATFS_H
-#define _CRIS_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif
-- 
2.1.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH 2/8] CRIS: UAPI: use generic auxvec.h
  2015-05-14 15:28 [PATCH 1/8] CRIS: UAPI: use generic headers via Kbuild Rabin Vincent
@ 2015-05-14 15:28 ` Rabin Vincent
  2015-05-14 15:28 ` [PATCH 3/8] CRIS: UAPI: use generic sockios.h Rabin Vincent
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Rabin Vincent @ 2015-05-14 15:28 UTC (permalink / raw)
  To: jesper.nilsson; +Cc: linux-kernel, linux-cris-kernel, Rabin Vincent

CRIS's auxvec.h is empty just like the asm-generic version.

Effective diff:

 @@ -1,4 +1,5 @@
 -#ifndef __ASMCRIS_AUXVEC_H
 -#define __ASMCRIS_AUXVEC_H
 +#ifndef __ASM_GENERIC_AUXVEC_H
 +#define __ASM_GENERIC_AUXVEC_H
 +

  #endif

Signed-off-by: Rabin Vincent <rabin@rab.in>
---
 arch/cris/include/asm/Kbuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index c1d6da9..161bbf7 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -1,4 +1,5 @@
 generic-y += atomic.h
+generic-y += auxvec.h
 generic-y += barrier.h
 generic-y += bitsperlong.h
 generic-y += clkdev.h
-- 
2.1.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH 3/8] CRIS: UAPI: use generic sockios.h
  2015-05-14 15:28 [PATCH 1/8] CRIS: UAPI: use generic headers via Kbuild Rabin Vincent
  2015-05-14 15:28 ` [PATCH 2/8] CRIS: UAPI: use generic auxvec.h Rabin Vincent
@ 2015-05-14 15:28 ` Rabin Vincent
  2015-05-14 15:28 ` [PATCH 4/8] CRIS: UAPI: use generic sembuf.h Rabin Vincent
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Rabin Vincent @ 2015-05-14 15:28 UTC (permalink / raw)
  To: jesper.nilsson; +Cc: linux-kernel, linux-cris-kernel, Rabin Vincent

CRIS' sockios.h is equivalent to the asm-generic version.

Effective diff:

 @@ -1,5 +1,5 @@
 -#ifndef __ARCH_CRIS_SOCKIOS__
 -#define __ARCH_CRIS_SOCKIOS__
 +#ifndef __ASM_GENERIC_SOCKIOS_H
 +#define __ASM_GENERIC_SOCKIOS_H

  #define FIOSETOWN 	0x8901

Signed-off-by: Rabin Vincent <rabin@rab.in>
---
 arch/cris/include/asm/Kbuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index 161bbf7..a17fb8c 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -33,6 +33,7 @@ generic-y += resource.h
 generic-y += scatterlist.h
 generic-y += sections.h
 generic-y += siginfo.h
+generic-y += sockios.h
 generic-y += statfs.h
 generic-y += topology.h
 generic-y += trace_clock.h
-- 
2.1.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH 4/8] CRIS: UAPI: use generic sembuf.h
  2015-05-14 15:28 [PATCH 1/8] CRIS: UAPI: use generic headers via Kbuild Rabin Vincent
  2015-05-14 15:28 ` [PATCH 2/8] CRIS: UAPI: use generic auxvec.h Rabin Vincent
  2015-05-14 15:28 ` [PATCH 3/8] CRIS: UAPI: use generic sockios.h Rabin Vincent
@ 2015-05-14 15:28 ` Rabin Vincent
  2015-05-14 15:28 ` [PATCH 5/8] CRIS: UAPI: use generic socket.h Rabin Vincent
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Rabin Vincent @ 2015-05-14 15:28 UTC (permalink / raw)
  To: jesper.nilsson; +Cc: linux-kernel, linux-cris-kernel, Rabin Vincent

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


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH 5/8] CRIS: UAPI: use generic socket.h
  2015-05-14 15:28 [PATCH 1/8] CRIS: UAPI: use generic headers via Kbuild Rabin Vincent
                   ` (2 preceding siblings ...)
  2015-05-14 15:28 ` [PATCH 4/8] CRIS: UAPI: use generic sembuf.h Rabin Vincent
@ 2015-05-14 15:28 ` Rabin Vincent
  2015-05-14 15:28 ` [PATCH 6/8] CRIS: UAPI: use generic msgbuf.h Rabin Vincent
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Rabin Vincent @ 2015-05-14 15:28 UTC (permalink / raw)
  To: jesper.nilsson; +Cc: linux-kernel, linux-cris-kernel, Rabin Vincent

CRIS' socket.h is equivalent to the asm-generic version.

Effective diff:

 @@ -1,7 +1,5 @@
 -#ifndef _ASM_SOCKET_H
 -#define _ASM_SOCKET_H
 -
 -
 +#ifndef __ASM_GENERIC_SOCKET_H
 +#define __ASM_GENERIC_SOCKET_H

  #include <asm/sockios.h>

 @@ -25,12 +23,14 @@
  #define SO_LINGER	13
  #define SO_BSDCOMPAT	14
  #define SO_REUSEPORT	15
 +#ifndef SO_PASSCRED
  #define SO_PASSCRED	16
  #define SO_PEERCRED	17
  #define SO_RCVLOWAT	18
  #define SO_SNDLOWAT	19
  #define SO_RCVTIMEO	20
  #define SO_SNDTIMEO	21
 +#endif

 #define SO_SECURITY_AUTHENTICATION		22

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

diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index 8a7e8ee..55d5d73 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -34,6 +34,7 @@ generic-y += scatterlist.h
 generic-y += sections.h
 generic-y += sembuf.h
 generic-y += siginfo.h
+generic-y += socket.h
 generic-y += sockios.h
 generic-y += statfs.h
 generic-y += topology.h
diff --git a/arch/cris/include/uapi/asm/socket.h b/arch/cris/include/uapi/asm/socket.h
deleted file mode 100644
index e2503d9f..0000000
--- a/arch/cris/include/uapi/asm/socket.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef _ASM_SOCKET_H
-#define _ASM_SOCKET_H
-
-/* almost the same as asm-i386/socket.h */
-
-#include <asm/sockios.h>
-
-/* For setsockoptions(2) */
-#define SOL_SOCKET	1
-
-#define SO_DEBUG	1
-#define SO_REUSEADDR	2
-#define SO_TYPE		3
-#define SO_ERROR	4
-#define SO_DONTROUTE	5
-#define SO_BROADCAST	6
-#define SO_SNDBUF	7
-#define SO_RCVBUF	8
-#define SO_SNDBUFFORCE	32
-#define SO_RCVBUFFORCE	33
-#define SO_KEEPALIVE	9
-#define SO_OOBINLINE	10
-#define SO_NO_CHECK	11
-#define SO_PRIORITY	12
-#define SO_LINGER	13
-#define SO_BSDCOMPAT	14
-#define SO_REUSEPORT	15
-#define SO_PASSCRED	16
-#define SO_PEERCRED	17
-#define SO_RCVLOWAT	18
-#define SO_SNDLOWAT	19
-#define SO_RCVTIMEO	20
-#define SO_SNDTIMEO	21
-
-/* Security levels - as per NRL IPv6 - don't actually do anything */
-#define SO_SECURITY_AUTHENTICATION		22
-#define SO_SECURITY_ENCRYPTION_TRANSPORT	23
-#define SO_SECURITY_ENCRYPTION_NETWORK		24
-
-#define SO_BINDTODEVICE	25
-
-/* Socket filtering */
-#define SO_ATTACH_FILTER        26
-#define SO_DETACH_FILTER        27
-#define SO_GET_FILTER		SO_ATTACH_FILTER
-
-#define SO_PEERNAME		28
-#define SO_TIMESTAMP           29
-#define SCM_TIMESTAMP          SO_TIMESTAMP
-
-#define SO_ACCEPTCONN          30
-
-#define SO_PEERSEC             31
-#define SO_PASSSEC		34
-#define SO_TIMESTAMPNS		35
-#define SCM_TIMESTAMPNS		SO_TIMESTAMPNS
-
-#define SO_MARK			36
-
-#define SO_TIMESTAMPING		37
-#define SCM_TIMESTAMPING	SO_TIMESTAMPING
-
-#define SO_PROTOCOL		38
-#define SO_DOMAIN		39
-
-#define SO_RXQ_OVFL             40
-
-#define SO_WIFI_STATUS		41
-#define SCM_WIFI_STATUS		SO_WIFI_STATUS
-#define SO_PEEK_OFF		42
-
-/* Instruct lower device to use last 4-bytes of skb data as FCS */
-#define SO_NOFCS		43
-
-#define SO_LOCK_FILTER		44
-
-#define SO_SELECT_ERR_QUEUE	45
-
-#define SO_BUSY_POLL		46
-
-#define SO_MAX_PACING_RATE	47
-
-#define SO_BPF_EXTENSIONS	48
-
-#define SO_INCOMING_CPU		49
-
-#define SO_ATTACH_BPF		50
-#define SO_DETACH_BPF		SO_DETACH_FILTER
-
-#endif /* _ASM_SOCKET_H */
-
-
-- 
2.1.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH 6/8] CRIS: UAPI: use generic msgbuf.h
  2015-05-14 15:28 [PATCH 1/8] CRIS: UAPI: use generic headers via Kbuild Rabin Vincent
                   ` (3 preceding siblings ...)
  2015-05-14 15:28 ` [PATCH 5/8] CRIS: UAPI: use generic socket.h Rabin Vincent
@ 2015-05-14 15:28 ` Rabin Vincent
  2015-05-14 15:28 ` [PATCH 7/8] CRIS: UAPI: use generic shmbuf.h Rabin Vincent
  2015-05-14 15:28 ` [PATCH 8/8] CRIS: UAPI: use generic types.h Rabin Vincent
  6 siblings, 0 replies; 8+ messages in thread
From: Rabin Vincent @ 2015-05-14 15:28 UTC (permalink / raw)
  To: jesper.nilsson; +Cc: linux-kernel, linux-cris-kernel, Rabin Vincent

CRIS' msgbuf.h is equivalent to the asm-generic version.

Effective diff:

 @@ -1,25 +1,30 @@
 -#ifndef _CRIS_MSGBUF_H
 -#define _CRIS_MSGBUF_H
 -
 -
 +#ifndef __ASM_GENERIC_MSGBUF_H
 +#define __ASM_GENERIC_MSGBUF_H

 +#include <asm/bitsperlong.h>

  struct msqid64_ds {
  	struct ipc64_perm msg_perm;
  	__kernel_time_t msg_stime;
 +#if __BITS_PER_LONG != 64
  	unsigned long	__unused1;
 +#endif
  	__kernel_time_t msg_rtime;
 +#if __BITS_PER_LONG != 64
  	unsigned long	__unused2;
 +#endif
  	__kernel_time_t msg_ctime;
 +#if __BITS_PER_LONG != 64
  	unsigned long	__unused3;
 -	unsigned long  msg_cbytes;
 -	unsigned long  msg_qnum;
 -	unsigned long  msg_qbytes;
 +#endif
 +	__kernel_ulong_t msg_cbytes;
 +	__kernel_ulong_t msg_qnum;
 +	__kernel_ulong_t msg_qbytes;
  	__kernel_pid_t msg_lspid;
  	__kernel_pid_t msg_lrpid;
 -	unsigned long  __unused4;
 -	unsigned long  __unused5;
 +	__kernel_ulong_t __unused4;
 +	__kernel_ulong_t __unused5;
  };

  #endif

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

diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index 55d5d73..2a3af55 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -26,6 +26,7 @@ generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += mman.h
 generic-y += module.h
+generic-y += msgbuf.h
 generic-y += percpu.h
 generic-y += poll.h
 generic-y += preempt.h
diff --git a/arch/cris/include/uapi/asm/msgbuf.h b/arch/cris/include/uapi/asm/msgbuf.h
deleted file mode 100644
index ada63df..0000000
--- a/arch/cris/include/uapi/asm/msgbuf.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef _CRIS_MSGBUF_H
-#define _CRIS_MSGBUF_H
-
-/* verbatim copy of asm-i386 version */
-
-/* 
- * The msqid64_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 msqid64_ds {
-	struct ipc64_perm msg_perm;
-	__kernel_time_t msg_stime;	/* last msgsnd time */
-	unsigned long	__unused1;
-	__kernel_time_t msg_rtime;	/* last msgrcv time */
-	unsigned long	__unused2;
-	__kernel_time_t msg_ctime;	/* last change time */
-	unsigned long	__unused3;
-	unsigned long  msg_cbytes;	/* current number of bytes on queue */
-	unsigned long  msg_qnum;	/* number of messages in queue */
-	unsigned long  msg_qbytes;	/* max number of bytes on queue */
-	__kernel_pid_t msg_lspid;	/* pid of last msgsnd */
-	__kernel_pid_t msg_lrpid;	/* last receive pid */
-	unsigned long  __unused4;
-	unsigned long  __unused5;
-};
-
-#endif /* _CRIS_MSGBUF_H */
-- 
2.1.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH 7/8] CRIS: UAPI: use generic shmbuf.h
  2015-05-14 15:28 [PATCH 1/8] CRIS: UAPI: use generic headers via Kbuild Rabin Vincent
                   ` (4 preceding siblings ...)
  2015-05-14 15:28 ` [PATCH 6/8] CRIS: UAPI: use generic msgbuf.h Rabin Vincent
@ 2015-05-14 15:28 ` Rabin Vincent
  2015-05-14 15:28 ` [PATCH 8/8] CRIS: UAPI: use generic types.h Rabin Vincent
  6 siblings, 0 replies; 8+ messages in thread
From: Rabin Vincent @ 2015-05-14 15:28 UTC (permalink / raw)
  To: jesper.nilsson; +Cc: linux-kernel, linux-cris-kernel, Rabin Vincent

CRIS' shmbuf.h is equivalent to the asm-generic verison.

Effective diff:

 @@ -1,5 +1,7 @@
 -#ifndef _CRIS_SHMBUF_H
 -#define _CRIS_SHMBUF_H
 +#ifndef __ASM_GENERIC_SHMBUF_H
 +#define __ASM_GENERIC_SHMBUF_H
 +
 +#include <asm/bitsperlong.h>

 @@ -7,28 +9,34 @@
  	struct ipc64_perm	shm_perm;
  	size_t			shm_segsz;
  	__kernel_time_t		shm_atime;
 +#if __BITS_PER_LONG != 64
  	unsigned long		__unused1;
 +#endif
  	__kernel_time_t		shm_dtime;
 +#if __BITS_PER_LONG != 64
  	unsigned long		__unused2;
 +#endif
  	__kernel_time_t		shm_ctime;
 +#if __BITS_PER_LONG != 64
  	unsigned long		__unused3;
 +#endif
  	__kernel_pid_t		shm_cpid;
  	__kernel_pid_t		shm_lpid;
 -	unsigned long		shm_nattch;
 -	unsigned long		__unused4;
 -	unsigned long		__unused5;
 +	__kernel_ulong_t	shm_nattch;
 +	__kernel_ulong_t	__unused4;
 +	__kernel_ulong_t	__unused5;
  };

  struct shminfo64 {
 -	unsigned long	shmmax;
 -	unsigned long	shmmin;
 -	unsigned long	shmmni;
 -	unsigned long	shmseg;
 -	unsigned long	shmall;
 -	unsigned long	__unused1;
 -	unsigned long	__unused2;
 -	unsigned long	__unused3;
 -	unsigned long	__unused4;
 +	__kernel_ulong_t	shmmax;
 +	__kernel_ulong_t	shmmin;
 +	__kernel_ulong_t	shmmni;
 +	__kernel_ulong_t	shmseg;
 +	__kernel_ulong_t	shmall;
 +	__kernel_ulong_t	__unused1;
 +	__kernel_ulong_t	__unused2;
 +	__kernel_ulong_t	__unused3;
 +	__kernel_ulong_t	__unused4;
  };

  #endif

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

diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index 2a3af55..db6cbc9 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -34,6 +34,7 @@ generic-y += resource.h
 generic-y += scatterlist.h
 generic-y += sections.h
 generic-y += sembuf.h
+generic-y += shmbuf.h
 generic-y += siginfo.h
 generic-y += socket.h
 generic-y += sockios.h
diff --git a/arch/cris/include/uapi/asm/shmbuf.h b/arch/cris/include/uapi/asm/shmbuf.h
deleted file mode 100644
index 3239e3f..0000000
--- a/arch/cris/include/uapi/asm/shmbuf.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _CRIS_SHMBUF_H
-#define _CRIS_SHMBUF_H
-
-/* 
- * The shmid64_ds structure for CRIS architecture (same as for i386)
- * 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 shmid64_ds {
-	struct ipc64_perm	shm_perm;	/* operation perms */
-	size_t			shm_segsz;	/* size of segment (bytes) */
-	__kernel_time_t		shm_atime;	/* last attach time */
-	unsigned long		__unused1;
-	__kernel_time_t		shm_dtime;	/* last detach time */
-	unsigned long		__unused2;
-	__kernel_time_t		shm_ctime;	/* last change time */
-	unsigned long		__unused3;
-	__kernel_pid_t		shm_cpid;	/* pid of creator */
-	__kernel_pid_t		shm_lpid;	/* pid of last operator */
-	unsigned long		shm_nattch;	/* no. of current attaches */
-	unsigned long		__unused4;
-	unsigned long		__unused5;
-};
-
-struct shminfo64 {
-	unsigned long	shmmax;
-	unsigned long	shmmin;
-	unsigned long	shmmni;
-	unsigned long	shmseg;
-	unsigned long	shmall;
-	unsigned long	__unused1;
-	unsigned long	__unused2;
-	unsigned long	__unused3;
-	unsigned long	__unused4;
-};
-
-#endif /* _CRIS_SHMBUF_H */
-- 
2.1.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH 8/8] CRIS: UAPI: use generic types.h
  2015-05-14 15:28 [PATCH 1/8] CRIS: UAPI: use generic headers via Kbuild Rabin Vincent
                   ` (5 preceding siblings ...)
  2015-05-14 15:28 ` [PATCH 7/8] CRIS: UAPI: use generic shmbuf.h Rabin Vincent
@ 2015-05-14 15:28 ` Rabin Vincent
  6 siblings, 0 replies; 8+ messages in thread
From: Rabin Vincent @ 2015-05-14 15:28 UTC (permalink / raw)
  To: jesper.nilsson; +Cc: linux-kernel, linux-cris-kernel, Rabin Vincent

CRIS' types.h is functionally identical to the asm-generic version.

Effective diff:

 @@ -1 +1,6 @@
 +#ifndef _ASM_GENERIC_TYPES_H
 +#define _ASM_GENERIC_TYPES_H
 +
  #include <asm-generic/int-ll64.h>
 +
 +#endif

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

diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index db6cbc9..2fc4331 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -41,5 +41,6 @@ generic-y += sockios.h
 generic-y += statfs.h
 generic-y += topology.h
 generic-y += trace_clock.h
+generic-y += types.h
 generic-y += vga.h
 generic-y += xor.h
diff --git a/arch/cris/include/asm/types.h b/arch/cris/include/asm/types.h
deleted file mode 100644
index a3cac77..0000000
--- a/arch/cris/include/asm/types.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ETRAX_TYPES_H
-#define _ETRAX_TYPES_H
-
-#include <uapi/asm/types.h>
-
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-
-#define BITS_PER_LONG 32
-
-#endif
diff --git a/arch/cris/include/uapi/asm/types.h b/arch/cris/include/uapi/asm/types.h
deleted file mode 100644
index 9ec9d4c..0000000
--- a/arch/cris/include/uapi/asm/types.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/int-ll64.h>
-- 
2.1.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-05-14 15:30 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-14 15:28 [PATCH 1/8] CRIS: UAPI: use generic headers via Kbuild Rabin Vincent
2015-05-14 15:28 ` [PATCH 2/8] CRIS: UAPI: use generic auxvec.h Rabin Vincent
2015-05-14 15:28 ` [PATCH 3/8] CRIS: UAPI: use generic sockios.h Rabin Vincent
2015-05-14 15:28 ` [PATCH 4/8] CRIS: UAPI: use generic sembuf.h Rabin Vincent
2015-05-14 15:28 ` [PATCH 5/8] CRIS: UAPI: use generic socket.h Rabin Vincent
2015-05-14 15:28 ` [PATCH 6/8] CRIS: UAPI: use generic msgbuf.h Rabin Vincent
2015-05-14 15:28 ` [PATCH 7/8] CRIS: UAPI: use generic shmbuf.h Rabin Vincent
2015-05-14 15:28 ` [PATCH 8/8] CRIS: UAPI: use generic types.h Rabin Vincent

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.