Commit 373ee21e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc updates from Helge Deller:
 "We have two patches in here:

   - The parisc uapi headers have been screwed up since quite some time.
     This patch fixes some bugs (e.g. endianess not respected in
     compat_semid64_ds) and cleans them up (e.g. uid_t was used instead
     of __kernel_uid_t) so that they can be used by userspace again.
     This patch has been reviewed by Arnd Bergmann and is scheduled for
     stable kernel series.

   - Drop the hpux_stat64 struct from stat.h, we do not support HP-UX
     binaries since kernel 4.0"

* 'parisc-4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fixes and cleanups in kernel uapi header files
  parisc: Drop hpux_stat64 struct from stat.h header file
parents f4d68930 d0cf62fb

arch/parisc/include/asm/compat.h

+2 −2
Original line number Diff line number Diff line
@@ -206,10 +206,10 @@ struct compat_ipc64_perm { 


struct compat_semid64_ds {

	struct compat_ipc64_perm sem_perm;

	compat_time_t sem_otime;

	unsigned int __unused1;

	compat_time_t sem_ctime;

	compat_time_t sem_otime;

	unsigned int __unused2;

	compat_time_t sem_ctime;

	compat_ulong_t sem_nsems;

	compat_ulong_t __unused3;

	compat_ulong_t __unused4;

arch/parisc/include/uapi/asm/ipcbuf.h

+12 −7
Original line number Diff line number Diff line 
#ifndef __PARISC_IPCBUF_H__

#define __PARISC_IPCBUF_H__



#include <asm/bitsperlong.h>

#include <linux/posix_types.h>



/*

 * The ipc64_perm structure for PA-RISC is almost identical to

 * kern_ipc_perm as we have always had 32-bit UIDs and GIDs in the kernel.
@@ -10,13 +13,15 @@ 


struct ipc64_perm

{

	key_t           key;

	uid_t           uid;

	gid_t           gid;

	uid_t           cuid;

	gid_t           cgid;

	__kernel_key_t		key;

	__kernel_uid_t		uid;

	__kernel_gid_t		gid;

	__kernel_uid_t		cuid;

	__kernel_gid_t		cgid;

#if __BITS_PER_LONG != 64

	unsigned short int	__pad1;

	mode_t          mode;

#endif

	__kernel_mode_t		mode;

	unsigned short int	__pad2;

	unsigned short int	seq;

	unsigned int		__pad3;

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

+5 −5
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ struct msqid64_ds { 
	unsigned int   __pad3;

#endif

	__kernel_time_t msg_ctime;	/* last change time */

	unsigned int  msg_cbytes;	/* current number of bytes on queue */

	unsigned int  msg_qnum;	/* number of messages in queue */

	unsigned int  msg_qbytes;	/* max number of bytes on queue */

	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 int  __unused1;

	unsigned int  __unused2;

	unsigned long __unused1;

	unsigned long __unused2;

};



#endif /* _PARISC_MSGBUF_H */

arch/parisc/include/uapi/asm/posix_types.h

+2 −0
Original line number Diff line number Diff line
@@ -7,8 +7,10 @@ 
 * assume GCC is being used.

 */



#ifndef __LP64__

typedef unsigned short		__kernel_mode_t;

#define __kernel_mode_t __kernel_mode_t

#endif



typedef unsigned short		__kernel_ipc_pid_t;

#define __kernel_ipc_pid_t __kernel_ipc_pid_t

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

+3 −3
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ struct semid64_ds { 
	unsigned int	__pad2;

#endif

	__kernel_time_t	sem_ctime;		/* last change time */

	unsigned int	sem_nsems;		/* no. of semaphores in array */

	unsigned int	__unused1;

	unsigned int	__unused2;

	unsigned long 	sem_nsems;		/* no. of semaphores in array */

	unsigned long	__unused1;

	unsigned long	__unused2;

};



#endif /* _PARISC_SEMBUF_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE