| Message ID | 20170526161946.7bf423c4@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b87901e6ec782b881224e1723eb142ff4b61bf70 |
| Headers | show |
On Fri, May 26, 2017 at 8:19 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > These are completely obvious as all they do is include the asm-generic > versions. > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> I think I had a patch series to do those some 10 years ago and never submitted it ;-) Acked-by: Arnd Bergmann <arnd@arndb.de> asm/sockios.h is identical to the asm-generic version, so we can do the same there. asm/swab.h is functionally identical, the asm-generic version also has a workaround for non-gcc compilers. asm/socket.h would also be easy to change so we mostly use asm-generic, the generic version already has a special case for powerpc.
Hi Arnd, On Fri, 26 May 2017 11:58:26 +0200 Arnd Bergmann <arnd@arndb.de> wrote: > > I think I had a patch series to do those some 10 years ago and never > submitted it ;-) Ah ha! :-) > Acked-by: Arnd Bergmann <arnd@arndb.de> > > asm/sockios.h is identical to the asm-generic version, so we can do > the same there. Yes, I see you found the next patch :-) > asm/swab.h is functionally identical, the asm-generic version > also has a workaround for non-gcc compilers. I'll have a look. > asm/socket.h would also be easy to change so we mostly use > asm-generic, the generic version already has a special case > for powerpc. Yes, that is what I was aiming at, but I will submit that to the networking tree as they have a patch to that powerpc file already which is why I noticed at all.
On Fri, 2017-05-26 at 06:19:46 UTC, Stephen Rothwell wrote: > These are completely obvious as all they do is include the asm-generic > versions. > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > Acked-by: Arnd Bergmann <arnd@arndb.de> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/b87901e6ec782b881224e1723eb142 cheers
diff --git a/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index b15bf6bc0e94..9aba4af4122e 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,2 +1,7 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm + +generic-y += param.h +generic-y += poll.h +generic-y += resource.h +generic-y += statfs.h diff --git a/arch/powerpc/include/uapi/asm/param.h b/arch/powerpc/include/uapi/asm/param.h deleted file mode 100644 index 965d45427975..000000000000 --- a/arch/powerpc/include/uapi/asm/param.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/param.h> diff --git a/arch/powerpc/include/uapi/asm/poll.h b/arch/powerpc/include/uapi/asm/poll.h deleted file mode 100644 index c98509d3149e..000000000000 --- a/arch/powerpc/include/uapi/asm/poll.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/poll.h> diff --git a/arch/powerpc/include/uapi/asm/resource.h b/arch/powerpc/include/uapi/asm/resource.h deleted file mode 100644 index 04bc4db8921b..000000000000 --- a/arch/powerpc/include/uapi/asm/resource.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/resource.h> diff --git a/arch/powerpc/include/uapi/asm/statfs.h b/arch/powerpc/include/uapi/asm/statfs.h deleted file mode 100644 index 5244834583a4..000000000000 --- a/arch/powerpc/include/uapi/asm/statfs.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_POWERPC_STATFS_H -#define _ASM_POWERPC_STATFS_H - -#include <asm-generic/statfs.h> - -#endif
These are completely obvious as all they do is include the asm-generic versions. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/powerpc/include/uapi/asm/Kbuild | 5 +++++ arch/powerpc/include/uapi/asm/param.h | 1 - arch/powerpc/include/uapi/asm/poll.h | 1 - arch/powerpc/include/uapi/asm/resource.h | 1 - arch/powerpc/include/uapi/asm/statfs.h | 6 ------ 5 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 arch/powerpc/include/uapi/asm/param.h delete mode 100644 arch/powerpc/include/uapi/asm/poll.h delete mode 100644 arch/powerpc/include/uapi/asm/resource.h delete mode 100644 arch/powerpc/include/uapi/asm/statfs.h Compile tested with powerpc ppc64_defconfig and headers_install output compared with only the include guards different (in statfs.h).