CRIS: UAPI: use generic shmbuf.h
authorRabin Vincent <rabin@rab.in>
Sat, 28 Feb 2015 22:55:46 +0000 (23:55 +0100)
committerJesper Nilsson <jespern@axis.com>
Fri, 4 Sep 2015 22:56:48 +0000 (00:56 +0200)
commit258a9ff66c30c830f6e2f06856878be4d4cc81af
treea1bf99441fd1751125d2d1caf4bcc32cedc6322a
parent74d94adb351161cc4027f94e878ac4e80adcfdc9
CRIS: UAPI: use generic shmbuf.h

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
arch/cris/include/uapi/asm/shmbuf.h [deleted file]