Commit e18afa5b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.quota-compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull compat quotactl cleanups from Al Viro:
 "More Christoph's compat cleanups: quotactl(2)"

* 'work.quota-compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  quota: simplify the quotactl compat handling
  compat: add a compat_need_64bit_alignment_fixup() helper
  compat: lift compat_s64 and compat_u64 to <asm-generic/compat.h>
parents 85ed13e7 80bdad3d

arch/arm64/include/asm/compat.h

+0 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ typedef s32 compat_nlink_t; 
typedef u16		compat_ipc_pid_t;

typedef u32		compat_caddr_t;

typedef __kernel_fsid_t	compat_fsid_t;

typedef s64		compat_s64;

typedef u64		compat_u64;



struct compat_stat {

#ifdef __AARCH64EB__

arch/mips/include/asm/compat.h

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ typedef s32 compat_caddr_t; 
typedef struct {

	s32	val[2];

} compat_fsid_t;

typedef s64		compat_s64;

typedef u64		compat_u64;



struct compat_stat {

	compat_dev_t	st_dev;

arch/parisc/include/asm/compat.h

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ typedef u32 compat_dev_t; 
typedef u16	compat_nlink_t;

typedef u16	compat_ipc_pid_t;

typedef u32	compat_caddr_t;

typedef s64	compat_s64;

typedef u64	compat_u64;



struct compat_stat {

	compat_dev_t		st_dev;	/* dev_t is 32 bits on parisc */

arch/powerpc/include/asm/compat.h

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ typedef s16 compat_nlink_t; 
typedef u16		compat_ipc_pid_t;

typedef u32		compat_caddr_t;

typedef __kernel_fsid_t	compat_fsid_t;

typedef s64		compat_s64;

typedef u64		compat_u64;



struct compat_stat {

	compat_dev_t	st_dev;

arch/s390/include/asm/compat.h

+0 −2
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ typedef u16 compat_nlink_t; 
typedef u16		compat_ipc_pid_t;

typedef u32		compat_caddr_t;

typedef __kernel_fsid_t	compat_fsid_t;

typedef s64		compat_s64;

typedef u64		compat_u64;



typedef struct {

	u32 mask;

CRA Git | Maintained and supported by SUSTech CRA and CCSE