From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: ppc-dev <linuxppc-dev@lists.ozlabs.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Subject: [PATCH] powerpc: use the asm-genric versions of some uapi includes
Date: Fri, 26 May 2017 16:19:46 +1000 [thread overview]
Message-ID: <20170526161946.7bf423c4@canb.auug.org.au> (raw)
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
next reply other threads:[~2017-05-26 6:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-26 6:19 Stephen Rothwell [this message]
2017-05-26 8:32 ` [PATCH] powerpc: use uapi/asm-generic/sockios.h Stephen Rothwell
2017-05-26 9:59 ` Arnd Bergmann
2017-05-26 10:32 ` Stephen Rothwell
2017-05-30 9:11 ` Michael Ellerman
2017-05-26 9:58 ` [PATCH] powerpc: use the asm-genric versions of some uapi includes Arnd Bergmann
2017-05-26 10:31 ` Stephen Rothwell
2017-05-30 9:11 ` Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170526161946.7bf423c4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).