Unverified Commit 7e9c3cb5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'asm-generic-compile-test' into asm-generic 

This series from Masahiro Yamada cleans up some of the kernel headers
to build cleanly as part of the UAPI checks.

Link: https://lore.kernel.org/lkml/20220210021129.3386083-1-masahiroy@kernel.org/#t

* asm-generic-compile-test:
  reiserfs_xattr.h: add linux/reiserfs_xattr.h to UAPI compile-test coverage
  kexec.h: add linux/kexec.h to UAPI compile-test coverage
  fsmap.h: add linux/fsmap.h to UAPI compile-test coverage
  android/binder.h: add linux/android/binder(fs).h to UAPI compile-test coverage
  shmbuf.h: add asm/shmbuf.h to UAPI compile-test coverage
  signal.h: add linux/signal.h and asm/signal.h to UAPI compile-test coverage
parents dfd42fac 2a5c0fdc

arch/alpha/include/uapi/asm/signal.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ struct sigaction { 
typedef struct sigaltstack {

	void __user *ss_sp;

	int ss_flags;

	size_t ss_size;

	__kernel_size_t ss_size;

} stack_t;



/* sigstack(2) is deprecated, and will be withdrawn in a future version

arch/arm/include/uapi/asm/signal.h

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ struct sigaction { 
typedef struct sigaltstack {

	void __user *ss_sp;

	int ss_flags;

	size_t ss_size;

	__kernel_size_t ss_size;

} stack_t;

arch/h8300/include/uapi/asm/signal.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ struct sigaction { 
typedef struct sigaltstack {

	void *ss_sp;

	int ss_flags;

	size_t ss_size;

	__kernel_size_t ss_size;

} stack_t;

arch/ia64/include/uapi/asm/signal.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ struct siginfo; 
typedef struct sigaltstack {

	void __user *ss_sp;

	int ss_flags;

	size_t ss_size;

	__kernel_size_t ss_size;

} stack_t;

arch/m68k/include/uapi/asm/signal.h

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ struct sigaction { 
typedef struct sigaltstack {

	void __user *ss_sp;

	int ss_flags;

	size_t ss_size;

	__kernel_size_t ss_size;

} stack_t;



#endif /* _UAPI_M68K_SIGNAL_H */