CRIS: UAPI: use generic sembuf.h (53789d25) · Commits · 戴 / test

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> Signed-off-by:

Jesper Nilsson <jesper.nilsson@axis.com>

arch/cris/include/asm/Kbuild

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ generic-y += poll.h
		generic-y += preempt.h
		generic-y += resource.h
		generic-y += sections.h
		generic-y += sembuf.h
		generic-y += siginfo.h
		generic-y += sockios.h
		generic-y += statfs.h

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

deleted100644 → 0

+0 −25

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

Admin message