[PATCH] powerpc: use the asm-genric versions of some uapi includes

[PATCH] powerpc: use the asm-genric versions of some uapi includes

[Stephen Rothwell]

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).

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
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

[PATCH] powerpc: use uapi/asm-generic/sockios.h

[Stephen Rothwell]

Hi all,

The arch version is identical except for comments and white space.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/include/uapi/asm/Kbuild    |  1 +
 arch/powerpc/include/uapi/asm/sockios.h | 20 --------------------
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 arch/powerpc/include/uapi/asm/sockios.h

This follows on from my previous "powerpc: use the asm-genric versions
of some uapi includes".

diff --git a/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild
index 9aba4af4122e..0d960ef78a9a 100644
--- a/arch/powerpc/include/uapi/asm/Kbuild
+++ b/arch/powerpc/include/uapi/asm/Kbuild
@@ -4,4 +4,5 @@ include include/uapi/asm-generic/Kbuild.asm
 generic-y += param.h
 generic-y += poll.h
 generic-y += resource.h
+generic-y += sockios.h
 generic-y += statfs.h
diff --git a/arch/powerpc/include/uapi/asm/sockios.h b/arch/powerpc/include/uapi/asm/sockios.h
deleted file mode 100644
index 55cef7675a31..000000000000
--- a/arch/powerpc/include/uapi/asm/sockios.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _ASM_POWERPC_SOCKIOS_H
-#define _ASM_POWERPC_SOCKIOS_H
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-/* Socket-level I/O control calls. */
-#define FIOSETOWN 	0x8901
-#define SIOCSPGRP	0x8902
-#define FIOGETOWN	0x8903
-#define SIOCGPGRP	0x8904
-#define SIOCATMARK	0x8905
-#define SIOCGSTAMP	0x8906		/* Get stamp (timeval) */
-#define SIOCGSTAMPNS	0x8907		/* Get stamp (timespec) */
-
-#endif	/* _ASM_POWERPC_SOCKIOS_H */
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

Re: [PATCH] powerpc: use the asm-genric versions of some uapi includes

[Arnd Bergmann]

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.

Re: [PATCH] powerpc: use uapi/asm-generic/sockios.h

[Arnd Bergmann]

On Fri, May 26, 2017 at 10:32 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> The arch version is identical except for comments and white space.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Acked-by: Arnd Bergmann <arnd@arndb.de>

Re: [PATCH] powerpc: use the asm-genric versions of some uapi includes

[Stephen Rothwell]

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.

-- 
Cheers,
Stephen Rothwell

Re: [PATCH] powerpc: use uapi/asm-generic/sockios.h

[Stephen Rothwell]

Hi Arnd,

On Fri, 26 May 2017 11:59:23 +0200 Arnd Bergmann <arnd@arndb.de> wrote:
>
> On Fri, May 26, 2017 at 10:32 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi all,
> >
> > The arch version is identical except for comments and white space.
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>  
> 
> Acked-by: Arnd Bergmann <arnd@arndb.de>

Thanks.

-- 
Cheers,
Stephen Rothwell

Re: powerpc: use the asm-genric versions of some uapi includes

[Michael Ellerman]

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

Re: powerpc: use uapi/asm-generic/sockios.h

[Michael Ellerman]

On Fri, 2017-05-26 at 08:32:29 UTC, Stephen Rothwell wrote:
> Hi all,
> 
> The arch version is identical except for comments and white space.
> 
> 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/308d263d3f28e816b0d7425ef8b35d

cheers