Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74d94adb authored by Rabin Vincent's avatar Rabin Vincent Committed by Jesper Nilsson
Browse files

CRIS: UAPI: use generic msgbuf.h 



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

Effective diff:

 -#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: default avatarRabin Vincent <rabin@rab.in>
Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
parent 45266922

arch/cris/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ generic-y += mcs_spinlock.h 
generic-y += mm-arch-hooks.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

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

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
#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 */