CRIS: UAPI: use generic msgbuf.h
authorRabin Vincent <rabin@rab.in>
Sat, 28 Feb 2015 22:53:37 +0000 (23:53 +0100)
committerJesper Nilsson <jespern@axis.com>
Fri, 4 Sep 2015 22:56:48 +0000 (00:56 +0200)
commit74d94adb351161cc4027f94e878ac4e80adcfdc9
tree9e1bdeb298594b7f899d3701901be6c719c9177a
parent45266922510fcd1e55df483f41be8debd5df9de8
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: Rabin Vincent <rabin@rab.in>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
arch/cris/include/asm/Kbuild
arch/cris/include/uapi/asm/msgbuf.h [deleted file]