CRIS: UAPI: use generic shmbuf.h (258a9ff6) · Commits · 戴 / test

CRIS' shmbuf.h is equivalent to the asm-generic verison. Effective diff: -#ifndef _CRIS_SHMBUF_H -#define _CRIS_SHMBUF_H +#ifndef __ASM_GENERIC_SHMBUF_H +#define __ASM_GENERIC_SHMBUF_H + +#include <asm/bitsperlong.h> 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> Signed-off-by:

Jesper Nilsson <jesper.nilsson@axis.com>

arch/cris/include/asm/Kbuild

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ generic-y += preempt.h
		generic-y += resource.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

arch/cris/include/uapi/asm/shmbuf.h

deleted100644 → 0

+0 −42

Original line number	Diff line number	Diff line
		#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 */

Admin message