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

Merge tag 'asm-generic-fixes-5.19' of... 

Merge tag 'asm-generic-fixes-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

Pull asm-generic fixes from Arnd Bergmann:
 "The header cleanup series from Masahiro Yamada ended up causing some
  regressions in the ABI because of an ambigous uid_t type.

  This was only caught after the original patches got merged, but at
  least the fixes are trivial and hopefully complete"

* tag 'asm-generic-fixes-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  binder: fix sender_euid type in uapi header
  sparc: fix mis-use of __kernel_{uid,gid}_t in uapi/asm/stat.h
  powerpc: use __kernel_{uid,gid}32_t in uapi/asm/stat.h
  mips: use __kernel_{uid,gid}32_t in uapi/asm/stat.h
parents 09a01817 8cc5b032

arch/mips/include/uapi/asm/stat.h

+6 −6
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ struct stat { 
	__kernel_ino_t	st_ino;

	__kernel_mode_t	st_mode;

	__u32		st_nlink;

	__kernel_uid_t	st_uid;

	__kernel_gid_t	st_gid;

	__kernel_uid32_t st_uid;

	__kernel_gid32_t st_gid;

	unsigned	st_rdev;

	long		st_pad2[2];

	long		st_size;
@@ -58,8 +58,8 @@ struct stat64 { 
	__kernel_mode_t	st_mode;

	__u32		st_nlink;



	__kernel_uid_t	st_uid;

	__kernel_gid_t	st_gid;

	__kernel_uid32_t st_uid;

	__kernel_gid32_t st_gid;



	unsigned long	st_rdev;

	unsigned long	st_pad1[3];	/* Reserved for st_rdev expansion  */
@@ -99,8 +99,8 @@ struct stat { 
	__kernel_mode_t		st_mode;

	__u32			st_nlink;



	__kernel_uid_t		st_uid;

	__kernel_gid_t		st_gid;

	__kernel_uid32_t	st_uid;

	__kernel_gid32_t	st_gid;



	unsigned int		st_rdev;

	unsigned int		st_pad1[3]; /* Reserved for st_rdev expansion */

arch/powerpc/include/uapi/asm/stat.h

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ struct stat { 
	__kernel_mode_t	st_mode;

	unsigned short	st_nlink;

#endif

	__kernel_uid_t	st_uid;

	__kernel_gid_t	st_gid;

	__kernel_uid32_t st_uid;

	__kernel_gid32_t st_gid;

	unsigned long	st_rdev;

	long		st_size;

	unsigned long	st_blksize;

arch/sparc/include/uapi/asm/stat.h

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ struct stat { 
	__kernel_ino_t st_ino;

	__kernel_mode_t st_mode;

	short   st_nlink;

	__kernel_uid_t st_uid;

	__kernel_gid_t st_gid;

	__kernel_uid32_t st_uid;

	__kernel_gid32_t st_gid;

	unsigned int st_rdev;

	long    st_size;

	long    st_atime;

include/uapi/linux/android/binder.h

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ struct binder_transaction_data { 
	/* General information about the transaction. */

	__u32	        flags;

	__kernel_pid_t	sender_pid;

	__kernel_uid_t	sender_euid;

	__kernel_uid32_t	sender_euid;

	binder_size_t	data_size;	/* number of bytes of data */

	binder_size_t	offsets_size;	/* number of bytes of offsets */