Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1683812 > unrolled thread
| Started by | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| First post | 2017-07-09 20:40 +0200 |
| Last post | 2017-07-10 11:20 +0200 |
| Articles | 14 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-07-09 20:40 +0200
[PATCH v2 24/28] unicore32: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-07-09 20:40 +0200
[PATCH v2 13/28] m32r: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-07-09 20:40 +0200
[PATCH v2 12/28] ia64: remove redundant generic-y += kvm_para.h from asm/Kbuild Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-07-09 20:40 +0200
[PATCH v2 19/28] openrisc: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-07-09 20:40 +0200
Re: [PATCH v2 19/28] openrisc: move generic-y of exported headers to uapi/asm/Kbuild Stafford Horne <shorne@gmail.com> - 2017-07-10 22:30 +0200
[PATCH v2 04/28] arm64: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-07-09 20:40 +0200
[PATCH v2 23/28] tile: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-07-09 20:40 +0200
[PATCH v2 09/28] cris: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-07-09 20:40 +0200
[PATCH v2 14/28] m68k: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-07-09 20:40 +0200
[PATCH v2 22/28] sparc: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-07-09 20:40 +0200
[PATCH v2 06/28] arc: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-07-09 20:40 +0200
Re: [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Sam Ravnborg <sam@ravnborg.org> - 2017-07-10 10:50 +0200
Re: [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-07-10 11:20 +0200
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-07-09 20:40 +0200 |
| Subject | [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst |
| Message-ID | <u1phD-2Oe-3@gated-at.bofh.it> |
In v4.12-rc1, we had a big progress for headers_install.
All (and only) headers under UAPI directories are exported.
However, asm-generic wrappers are still exceptions because
most of arch/*/include/asm/Kbuild include "generic-y" for
exported headers. As a result, many of generic-wrappers to be
exported are generated outside UAPI directories.
To finish de-coupling UAPI, "generic-y" for exported headers
should be moved to arch/*/include/uapi/asm/Kbuild.
With those cleanups, the logic of headers_install will become
even simpler. UAPI will be completely self-contained.
This series is based on:
commit 19bf2e0ef18ec8a7284ecc83459a2664cb885cd5
Changes for v2:
- rebase on the latest in the mainline in order to avoid merge conflicts
Masahiro Yamada (28):
kbuild: remove useless $(gen) variable in Makefile.headersinst
kbuild: fix comment about dst of headers_{install,check}_all
kbuild: pass dst= to Makefile.headersinst from top Makefile
arm64: move generic-y of exported headers to uapi/asm/Kbuild
ARM: move generic-y of exported headers to uapi/asm/Kbuild
arc: move generic-y of exported headers to uapi/asm/Kbuild
blackfin: move generic-y of exported headers to uapi/asm/Kbuild
c6x: move generic-y of exported headers to uapi/asm/Kbuild
cris: move generic-y of exported headers to uapi/asm/Kbuild
h8300: move generic-y of exported headers to uapi/asm/Kbuild
hexagon: move generic-y of exported headers to uapi/asm/Kbuild
ia64: remove redundant generic-y += kvm_para.h from asm/Kbuild
m32r: move generic-y of exported headers to uapi/asm/Kbuild
m68k: move generic-y of exported headers to uapi/asm/Kbuild
metag: move generic-y of exported headers to uapi/asm/Kbuild
microblaze: move generic-y of exported headers to uapi/asm/Kbuild
nios2: remove unneeded arch/nios2/include/(generated/)asm/signal.h
nios2: move generic-y of exported headers to uapi/asm/Kbuild
openrisc: move generic-y of exported headers to uapi/asm/Kbuild
parisc: move generic-y of exported headers to uapi/asm/Kbuild
sh: move generic-y of exported headers to uapi/asm/Kbuild
sparc: move generic-y of exported headers to uapi/asm/Kbuild
tile: move generic-y of exported headers to uapi/asm/Kbuild
unicore32: move generic-y of exported headers to uapi/asm/Kbuild
xtensa: move generic-y of exported headers to uapi/asm/Kbuild
kbuild: do not include old-kbuild-file from Makefile.headersinst
kbuild: split exported generic header creation into uapi-asm-generic
kbuild: remove wrapper files handling from Makefile.headersinst
Makefile | 13 +++++++------
arch/arc/include/asm/Kbuild | 24 ------------------------
arch/arc/include/uapi/asm/Kbuild | 24 ++++++++++++++++++++++++
arch/arm/include/asm/Kbuild | 16 ----------------
arch/arm/include/uapi/asm/Kbuild | 14 ++++++++++++++
arch/arm64/include/asm/Kbuild | 17 -----------------
arch/arm64/include/uapi/asm/Kbuild | 16 ++++++++++++++++
arch/blackfin/include/asm/Kbuild | 24 +-----------------------
arch/blackfin/include/uapi/asm/Kbuild | 22 ++++++++++++++++++++++
arch/c6x/include/asm/Kbuild | 28 +---------------------------
arch/c6x/include/uapi/asm/Kbuild | 25 +++++++++++++++++++++++++
arch/cris/include/asm/Kbuild | 21 ++-------------------
arch/cris/include/uapi/asm/Kbuild | 17 +++++++++++++++++
arch/h8300/include/asm/Kbuild | 30 ++----------------------------
arch/h8300/include/uapi/asm/Kbuild | 26 ++++++++++++++++++++++++++
arch/hexagon/include/asm/Kbuild | 24 +-----------------------
arch/hexagon/include/uapi/asm/Kbuild | 22 ++++++++++++++++++++++
arch/ia64/include/asm/Kbuild | 2 --
arch/m32r/include/asm/Kbuild | 4 +---
arch/m32r/include/uapi/asm/Kbuild | 3 ++-
arch/m68k/include/asm/Kbuild | 13 +------------
arch/m68k/include/uapi/asm/Kbuild | 10 ++++++++++
arch/metag/include/asm/Kbuild | 26 +-------------------------
arch/metag/include/uapi/asm/Kbuild | 24 ++++++++++++++++++++++++
arch/microblaze/include/asm/Kbuild | 25 -------------------------
arch/microblaze/include/uapi/asm/Kbuild | 25 ++++++++++++++++++++++++-
arch/nios2/include/asm/Kbuild | 26 +-------------------------
arch/nios2/include/asm/signal.h | 22 ----------------------
arch/nios2/include/uapi/asm/Kbuild | 23 +++++++++++++++++++++++
arch/openrisc/include/asm/Kbuild | 29 +----------------------------
arch/openrisc/include/uapi/asm/Kbuild | 27 +++++++++++++++++++++++++++
arch/parisc/include/asm/Kbuild | 7 +------
arch/parisc/include/uapi/asm/Kbuild | 4 ++++
arch/sh/include/asm/Kbuild | 19 -------------------
arch/sh/include/uapi/asm/Kbuild | 18 ++++++++++++++++++
arch/sparc/include/asm/Kbuild | 1 -
arch/sparc/include/uapi/asm/Kbuild | 2 ++
arch/tile/include/asm/Kbuild | 19 -------------------
arch/tile/include/uapi/asm/Kbuild | 19 +++++++++++++++++++
arch/unicore32/include/asm/Kbuild | 30 +-----------------------------
arch/unicore32/include/uapi/asm/Kbuild | 27 +++++++++++++++++++++++++++
arch/xtensa/include/asm/Kbuild | 10 +---------
arch/xtensa/include/uapi/asm/Kbuild | 9 +++++++++
scripts/Makefile.headersinst | 29 ++++-------------------------
44 files changed, 381 insertions(+), 435 deletions(-)
delete mode 100644 arch/nios2/include/asm/signal.h
--
2.7.4
[toc] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-07-09 20:40 +0200 |
| Subject | [PATCH v2 24/28] unicore32: move generic-y of exported headers to uapi/asm/Kbuild |
| Message-ID | <u1phF-2Oe-53@gated-at.bofh.it> |
| In reply to | #1683812 |
Since commit fcc8487d477a ("uapi: export all headers under uapi
directories"), all (and only) headers under uapi directories are
exported, but asm-generic wrappers are still exceptions.
To complete de-coupling the uapi from kernel headers, move generic-y
of exported headers to uapi/asm/Kbuild.
With this change, "make headers_install" will just need to parse
uapi/asm/Kbuild to build up exported headers.
Also, move "generic-y += kprobes.h" up in order to keep the entries
sorted.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/unicore32/include/asm/Kbuild | 30 +-----------------------------
arch/unicore32/include/uapi/asm/Kbuild | 27 +++++++++++++++++++++++++++
2 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild
index 7a53a55341de..fda7e2153086 100644
--- a/arch/unicore32/include/asm/Kbuild
+++ b/arch/unicore32/include/asm/Kbuild
@@ -1,66 +1,38 @@
-
generic-y += atomic.h
-generic-y += auxvec.h
-generic-y += bitsperlong.h
generic-y += bugs.h
generic-y += clkdev.h
generic-y += current.h
generic-y += device.h
generic-y += div64.h
generic-y += emergency-restart.h
-generic-y += errno.h
generic-y += exec.h
generic-y += extable.h
generic-y += fb.h
-generic-y += fcntl.h
generic-y += ftrace.h
generic-y += futex.h
generic-y += hardirq.h
generic-y += hw_irq.h
-generic-y += ioctl.h
-generic-y += ioctls.h
-generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += irq_work.h
generic-y += kdebug.h
generic-y += kmap_types.h
+generic-y += kprobes.h
generic-y += local.h
generic-y += mcs_spinlock.h
generic-y += mm-arch-hooks.h
-generic-y += mman.h
generic-y += module.h
-generic-y += msgbuf.h
-generic-y += param.h
generic-y += parport.h
generic-y += percpu.h
-generic-y += poll.h
-generic-y += posix_types.h
generic-y += preempt.h
-generic-y += resource.h
generic-y += sections.h
generic-y += segment.h
-generic-y += sembuf.h
generic-y += serial.h
-generic-y += setup.h
-generic-y += shmbuf.h
-generic-y += shmparam.h
-generic-y += signal.h
generic-y += sizes.h
-generic-y += socket.h
-generic-y += sockios.h
-generic-y += stat.h
-generic-y += statfs.h
-generic-y += swab.h
generic-y += syscalls.h
-generic-y += termbits.h
-generic-y += termios.h
generic-y += topology.h
generic-y += trace_clock.h
-generic-y += types.h
-generic-y += ucontext.h
generic-y += unaligned.h
generic-y += user.h
generic-y += vga.h
generic-y += word-at-a-time.h
generic-y += xor.h
-generic-y += kprobes.h
diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild
index 1c44d3b3eba0..759a71411169 100644
--- a/arch/unicore32/include/uapi/asm/Kbuild
+++ b/arch/unicore32/include/uapi/asm/Kbuild
@@ -1,5 +1,32 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+generic-y += auxvec.h
+generic-y += bitsperlong.h
+generic-y += errno.h
+generic-y += fcntl.h
+generic-y += ioctl.h
+generic-y += ioctls.h
+generic-y += ipcbuf.h
generic-y += kvm_para.h
+generic-y += mman.h
+generic-y += msgbuf.h
+generic-y += param.h
+generic-y += poll.h
+generic-y += posix_types.h
+generic-y += resource.h
+generic-y += sembuf.h
+generic-y += setup.h
+generic-y += shmbuf.h
+generic-y += shmparam.h
generic-y += siginfo.h
+generic-y += signal.h
+generic-y += socket.h
+generic-y += sockios.h
+generic-y += stat.h
+generic-y += statfs.h
+generic-y += swab.h
+generic-y += termbits.h
+generic-y += termios.h
+generic-y += types.h
+generic-y += ucontext.h
--
2.7.4
[toc] | [prev] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-07-09 20:40 +0200 |
| Subject | [PATCH v2 13/28] m32r: move generic-y of exported headers to uapi/asm/Kbuild |
| Message-ID | <u1phG-2Oe-55@gated-at.bofh.it> |
| In reply to | #1683812 |
Since commit fcc8487d477a ("uapi: export all headers under uapi
directories"), all (and only) headers under uapi directories are
exported, but asm-generic wrappers are still exceptions.
To complete de-coupling the uapi from kernel headers, move generic-y
of exported headers to uapi/asm/Kbuild.
With this change, "make headers_install" will just need to parse
uapi/asm/Kbuild to build up exported headers.
Also, move "generic-y += kprobes.h" up in order to keep the entries
sorted.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/m32r/include/asm/Kbuild | 4 +---
arch/m32r/include/uapi/asm/Kbuild | 3 ++-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild
index c000ffac8586..7e11b125c35e 100644
--- a/arch/m32r/include/asm/Kbuild
+++ b/arch/m32r/include/asm/Kbuild
@@ -1,10 +1,9 @@
-
generic-y += clkdev.h
generic-y += current.h
generic-y += exec.h
generic-y += extable.h
generic-y += irq_work.h
-generic-y += kvm_para.h
+generic-y += kprobes.h
generic-y += mcs_spinlock.h
generic-y += mm-arch-hooks.h
generic-y += module.h
@@ -12,4 +11,3 @@ generic-y += preempt.h
generic-y += sections.h
generic-y += trace_clock.h
generic-y += word-at-a-time.h
-generic-y += kprobes.h
diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild
index c94ee54210bc..1c44d3b3eba0 100644
--- a/arch/m32r/include/uapi/asm/Kbuild
+++ b/arch/m32r/include/uapi/asm/Kbuild
@@ -1,4 +1,5 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-generic-y += siginfo.h
+generic-y += kvm_para.h
+generic-y += siginfo.h
--
2.7.4
[toc] | [prev] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-07-09 20:40 +0200 |
| Subject | [PATCH v2 12/28] ia64: remove redundant generic-y += kvm_para.h from asm/Kbuild |
| Message-ID | <u1phG-2Oe-63@gated-at.bofh.it> |
| In reply to | #1683812 |
"generic-y += kvm_para.h" is doubled in asm/Kbuild and uapi/asm/Kbuild. The one in the former should be simply removed because kvm_para.h is exported. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/ia64/include/asm/Kbuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild index 502a91d8dbbd..1d7641f891e1 100644 --- a/arch/ia64/include/asm/Kbuild +++ b/arch/ia64/include/asm/Kbuild @@ -1,8 +1,6 @@ - generic-y += clkdev.h generic-y += exec.h generic-y += irq_work.h -generic-y += kvm_para.h generic-y += mcs_spinlock.h generic-y += mm-arch-hooks.h generic-y += preempt.h -- 2.7.4
[toc] | [prev] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-07-09 20:40 +0200 |
| Subject | [PATCH v2 19/28] openrisc: move generic-y of exported headers to uapi/asm/Kbuild |
| Message-ID | <u1phG-2Oe-57@gated-at.bofh.it> |
| In reply to | #1683812 |
Since commit fcc8487d477a ("uapi: export all headers under uapi
directories"), all (and only) headers under uapi directories are
exported, but asm-generic wrappers are still exceptions.
To complete de-coupling the uapi from kernel headers, move generic-y
of exported headers to uapi/asm/Kbuild.
With this change, "make headers_install" will just need to parse
uapi/asm/Kbuild to build up exported headers.
Also, move "generic-y += kprobes.h" up in order to keep the entries
sorted.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/openrisc/include/asm/Kbuild | 29 +----------------------------
arch/openrisc/include/uapi/asm/Kbuild | 27 +++++++++++++++++++++++++++
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild
index 091585addb91..5bea416a7792 100644
--- a/arch/openrisc/include/asm/Kbuild
+++ b/arch/openrisc/include/asm/Kbuild
@@ -1,6 +1,4 @@
-generic-y += auxvec.h
generic-y += barrier.h
-generic-y += bitsperlong.h
generic-y += bug.h
generic-y += bugs.h
generic-y += cacheflush.h
@@ -11,57 +9,32 @@ generic-y += device.h
generic-y += div64.h
generic-y += dma.h
generic-y += emergency-restart.h
-generic-y += errno.h
generic-y += exec.h
generic-y += extable.h
generic-y += fb.h
-generic-y += fcntl.h
generic-y += ftrace.h
generic-y += hardirq.h
generic-y += hw_irq.h
-generic-y += ioctl.h
-generic-y += ioctls.h
-generic-y += ipcbuf.h
generic-y += irq.h
generic-y += irq_regs.h
generic-y += irq_work.h
generic-y += kdebug.h
generic-y += kmap_types.h
-generic-y += kvm_para.h
+generic-y += kprobes.h
generic-y += local.h
generic-y += mcs_spinlock.h
generic-y += mm-arch-hooks.h
-generic-y += mman.h
generic-y += module.h
-generic-y += msgbuf.h
generic-y += pci.h
generic-y += percpu.h
-generic-y += poll.h
-generic-y += posix_types.h
generic-y += preempt.h
-generic-y += resource.h
generic-y += sections.h
generic-y += segment.h
-generic-y += sembuf.h
-generic-y += setup.h
-generic-y += shmbuf.h
-generic-y += shmparam.h
-generic-y += signal.h
-generic-y += socket.h
-generic-y += sockios.h
-generic-y += stat.h
-generic-y += statfs.h
generic-y += string.h
-generic-y += swab.h
generic-y += switch_to.h
-generic-y += termbits.h
-generic-y += termios.h
generic-y += topology.h
generic-y += trace_clock.h
-generic-y += types.h
-generic-y += ucontext.h
generic-y += user.h
generic-y += vga.h
generic-y += word-at-a-time.h
generic-y += xor.h
-generic-y += kprobes.h
diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild
index b55fc2ae1e8c..62286dbeb904 100644
--- a/arch/openrisc/include/uapi/asm/Kbuild
+++ b/arch/openrisc/include/uapi/asm/Kbuild
@@ -1,4 +1,31 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+generic-y += auxvec.h
+generic-y += bitsperlong.h
+generic-y += errno.h
+generic-y += fcntl.h
+generic-y += ioctl.h
+generic-y += ioctls.h
+generic-y += ipcbuf.h
+generic-y += kvm_para.h
+generic-y += mman.h
+generic-y += msgbuf.h
+generic-y += poll.h
+generic-y += posix_types.h
+generic-y += resource.h
+generic-y += sembuf.h
+generic-y += setup.h
+generic-y += shmbuf.h
+generic-y += shmparam.h
generic-y += siginfo.h
+generic-y += signal.h
+generic-y += socket.h
+generic-y += sockios.h
+generic-y += stat.h
+generic-y += statfs.h
+generic-y += swab.h
+generic-y += termbits.h
+generic-y += termios.h
+generic-y += types.h
+generic-y += ucontext.h
--
2.7.4
[toc] | [prev] | [next] | [standalone]
| From | Stafford Horne <shorne@gmail.com> |
|---|---|
| Date | 2017-07-10 22:30 +0200 |
| Subject | Re: [PATCH v2 19/28] openrisc: move generic-y of exported headers to uapi/asm/Kbuild |
| Message-ID | <u1NtD-1hE-11@gated-at.bofh.it> |
| In reply to | #1683816 |
On Mon, Jul 10, 2017 at 03:32:51AM +0900, Masahiro Yamada wrote:
> Since commit fcc8487d477a ("uapi: export all headers under uapi
> directories"), all (and only) headers under uapi directories are
> exported, but asm-generic wrappers are still exceptions.
>
> To complete de-coupling the uapi from kernel headers, move generic-y
> of exported headers to uapi/asm/Kbuild.
>
> With this change, "make headers_install" will just need to parse
> uapi/asm/Kbuild to build up exported headers.
>
> Also, move "generic-y += kprobes.h" up in order to keep the entries
> sorted.
Thanks this looks good.
Acked-by: Stafford Horne <shorne@gmail.com>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
[toc] | [prev] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-07-09 20:40 +0200 |
| Subject | [PATCH v2 04/28] arm64: move generic-y of exported headers to uapi/asm/Kbuild |
| Message-ID | <u1phG-2Oe-67@gated-at.bofh.it> |
| In reply to | #1683812 |
Since commit fcc8487d477a ("uapi: export all headers under uapi
directories"), all (and only) headers under uapi directories are
exported, but asm-generic wrappers are still exceptions.
To complete de-coupling the uapi from kernel headers, move generic-y
of exported headers to uapi/asm/Kbuild.
With this change, "make headers_install" will just need to parse
uapi/asm/Kbuild to build up exported headers.
For arm64, "generic-y += kvm_para.h" is doubled in asm/Kbuild and
uapi/asm/Kbuild. So, the one in the former can be simply removed.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
---
arch/arm64/include/asm/Kbuild | 17 -----------------
arch/arm64/include/uapi/asm/Kbuild | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
index a7a97a608033..f81c7b685fc6 100644
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@ -6,41 +6,24 @@ generic-y += dma.h
generic-y += dma-contiguous.h
generic-y += early_ioremap.h
generic-y += emergency-restart.h
-generic-y += errno.h
generic-y += hw_irq.h
-generic-y += ioctl.h
-generic-y += ioctls.h
-generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += kdebug.h
generic-y += kmap_types.h
-generic-y += kvm_para.h
generic-y += local.h
generic-y += local64.h
generic-y += mcs_spinlock.h
generic-y += mm-arch-hooks.h
-generic-y += mman.h
-generic-y += msgbuf.h
generic-y += msi.h
-generic-y += poll.h
generic-y += preempt.h
-generic-y += resource.h
generic-y += rwsem.h
generic-y += segment.h
-generic-y += sembuf.h
generic-y += serial.h
generic-y += set_memory.h
-generic-y += shmbuf.h
generic-y += simd.h
generic-y += sizes.h
-generic-y += socket.h
-generic-y += sockios.h
-generic-y += swab.h
generic-y += switch_to.h
-generic-y += termbits.h
-generic-y += termios.h
generic-y += trace_clock.h
-generic-y += types.h
generic-y += unaligned.h
generic-y += user.h
generic-y += vga.h
diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild
index 13a97aa2285f..fc28bd95c6d3 100644
--- a/arch/arm64/include/uapi/asm/Kbuild
+++ b/arch/arm64/include/uapi/asm/Kbuild
@@ -1,4 +1,20 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+generic-y += errno.h
+generic-y += ioctl.h
+generic-y += ioctls.h
+generic-y += ipcbuf.h
generic-y += kvm_para.h
+generic-y += mman.h
+generic-y += msgbuf.h
+generic-y += poll.h
+generic-y += resource.h
+generic-y += sembuf.h
+generic-y += shmbuf.h
+generic-y += socket.h
+generic-y += sockios.h
+generic-y += swab.h
+generic-y += termbits.h
+generic-y += termios.h
+generic-y += types.h
--
2.7.4
[toc] | [prev] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-07-09 20:40 +0200 |
| Subject | [PATCH v2 23/28] tile: move generic-y of exported headers to uapi/asm/Kbuild |
| Message-ID | <u1phG-2Oe-59@gated-at.bofh.it> |
| In reply to | #1683812 |
Since commit fcc8487d477a ("uapi: export all headers under uapi
directories"), all (and only) headers under uapi directories are
exported, but asm-generic wrappers are still exceptions.
To complete de-coupling the uapi from kernel headers, move generic-y
of exported headers to uapi/asm/Kbuild.
With this change, "make headers_install" will just need to parse
uapi/asm/Kbuild to build up exported headers.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/tile/include/asm/Kbuild | 19 -------------------
arch/tile/include/uapi/asm/Kbuild | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild
index 16f0b08c8ce9..d28d2b8932c7 100644
--- a/arch/tile/include/asm/Kbuild
+++ b/arch/tile/include/asm/Kbuild
@@ -2,37 +2,18 @@ generic-y += bug.h
generic-y += bugs.h
generic-y += clkdev.h
generic-y += emergency-restart.h
-generic-y += errno.h
generic-y += exec.h
generic-y += extable.h
generic-y += fb.h
-generic-y += fcntl.h
generic-y += hw_irq.h
-generic-y += ioctl.h
-generic-y += ioctls.h
-generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += local.h
generic-y += local64.h
generic-y += mcs_spinlock.h
generic-y += mm-arch-hooks.h
-generic-y += msgbuf.h
-generic-y += param.h
generic-y += parport.h
-generic-y += poll.h
-generic-y += posix_types.h
generic-y += preempt.h
-generic-y += resource.h
generic-y += seccomp.h
-generic-y += sembuf.h
generic-y += serial.h
-generic-y += shmbuf.h
-generic-y += shmparam.h
-generic-y += socket.h
-generic-y += sockios.h
-generic-y += statfs.h
-generic-y += termbits.h
-generic-y += termios.h
generic-y += trace_clock.h
-generic-y += types.h
generic-y += xor.h
diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild
index 0c74c3c5ebfa..5711de0a1b5e 100644
--- a/arch/tile/include/uapi/asm/Kbuild
+++ b/arch/tile/include/uapi/asm/Kbuild
@@ -1,4 +1,23 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+generic-y += errno.h
+generic-y += fcntl.h
+generic-y += ioctl.h
+generic-y += ioctls.h
+generic-y += ipcbuf.h
+generic-y += msgbuf.h
+generic-y += param.h
+generic-y += poll.h
+generic-y += posix_types.h
+generic-y += resource.h
+generic-y += sembuf.h
+generic-y += shmbuf.h
+generic-y += shmparam.h
+generic-y += socket.h
+generic-y += sockios.h
+generic-y += statfs.h
+generic-y += termbits.h
+generic-y += termios.h
+generic-y += types.h
generic-y += ucontext.h
--
2.7.4
[toc] | [prev] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-07-09 20:40 +0200 |
| Subject | [PATCH v2 09/28] cris: move generic-y of exported headers to uapi/asm/Kbuild |
| Message-ID | <u1phG-2Oe-69@gated-at.bofh.it> |
| In reply to | #1683812 |
Since commit fcc8487d477a ("uapi: export all headers under uapi
directories"), all (and only) headers under uapi directories are
exported, but asm-generic wrappers are still exceptions.
To complete de-coupling the uapi from kernel headers, move generic-y
of exported headers to uapi/asm/Kbuild.
With this change, "make headers_install" will just need to parse
uapi/asm/Kbuild to build up exported headers.
Also, move "generic-y += kprobes.h", "generic-y += emergency-restart.h"
up in order to keep the entries sorted.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/cris/include/asm/Kbuild | 21 ++-------------------
arch/cris/include/uapi/asm/Kbuild | 17 +++++++++++++++++
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index acc5781100c2..460349cb147f 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -1,48 +1,31 @@
generic-y += atomic.h
-generic-y += auxvec.h
generic-y += barrier.h
-generic-y += bitsperlong.h
generic-y += clkdev.h
generic-y += cmpxchg.h
generic-y += current.h
generic-y += device.h
generic-y += div64.h
-generic-y += errno.h
+generic-y += emergency-restart.h
generic-y += exec.h
generic-y += extable.h
-generic-y += emergency-restart.h
-generic-y += fcntl.h
generic-y += futex.h
generic-y += hardirq.h
-generic-y += ioctl.h
-generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += irq_work.h
generic-y += kdebug.h
generic-y += kmap_types.h
-generic-y += kvm_para.h
+generic-y += kprobes.h
generic-y += linkage.h
generic-y += local.h
generic-y += local64.h
generic-y += mcs_spinlock.h
generic-y += mm-arch-hooks.h
-generic-y += mman.h
generic-y += module.h
-generic-y += msgbuf.h
generic-y += percpu.h
-generic-y += poll.h
generic-y += preempt.h
-generic-y += resource.h
generic-y += sections.h
-generic-y += sembuf.h
-generic-y += shmbuf.h
-generic-y += socket.h
-generic-y += sockios.h
-generic-y += statfs.h
generic-y += topology.h
generic-y += trace_clock.h
-generic-y += types.h
generic-y += vga.h
generic-y += word-at-a-time.h
generic-y += xor.h
-generic-y += kprobes.h
diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild
index b55fc2ae1e8c..3687b54bb18e 100644
--- a/arch/cris/include/uapi/asm/Kbuild
+++ b/arch/cris/include/uapi/asm/Kbuild
@@ -1,4 +1,21 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+generic-y += auxvec.h
+generic-y += bitsperlong.h
+generic-y += errno.h
+generic-y += fcntl.h
+generic-y += ioctl.h
+generic-y += ipcbuf.h
+generic-y += kvm_para.h
+generic-y += mman.h
+generic-y += msgbuf.h
+generic-y += poll.h
+generic-y += resource.h
+generic-y += sembuf.h
+generic-y += shmbuf.h
generic-y += siginfo.h
+generic-y += socket.h
+generic-y += sockios.h
+generic-y += statfs.h
+generic-y += types.h
--
2.7.4
[toc] | [prev] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-07-09 20:40 +0200 |
| Subject | [PATCH v2 14/28] m68k: move generic-y of exported headers to uapi/asm/Kbuild |
| Message-ID | <u1phG-2Oe-71@gated-at.bofh.it> |
| In reply to | #1683812 |
Since commit fcc8487d477a ("uapi: export all headers under uapi
directories"), all (and only) headers under uapi directories are
exported, but asm-generic wrappers are still exceptions.
To complete de-coupling the uapi from kernel headers, move generic-y
of exported headers to uapi/asm/Kbuild.
With this change, "make headers_install" will just need to parse
uapi/asm/Kbuild to build up exported headers.
For m68k, "generic-y += termios.h" is doubled in asm/Kbuild and
uapi/asm/Kbuild. So, the one in the former can be simply removed.
Also, move "generic-y += kprobes.h" up in order to keep the entries
sorted.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
arch/m68k/include/asm/Kbuild | 13 +------------
arch/m68k/include/uapi/asm/Kbuild | 10 ++++++++++
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 5ecf4e47b2e2..59d6d0d38f67 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -1,36 +1,25 @@
generic-y += barrier.h
-generic-y += bitsperlong.h
generic-y += clkdev.h
generic-y += device.h
generic-y += emergency-restart.h
-generic-y += errno.h
generic-y += exec.h
generic-y += extable.h
generic-y += futex.h
generic-y += hw_irq.h
-generic-y += ioctl.h
-generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += irq_work.h
generic-y += kdebug.h
generic-y += kmap_types.h
-generic-y += kvm_para.h
+generic-y += kprobes.h
generic-y += local.h
generic-y += local64.h
generic-y += mcs_spinlock.h
generic-y += mm-arch-hooks.h
-generic-y += mman.h
generic-y += percpu.h
generic-y += preempt.h
-generic-y += resource.h
generic-y += sections.h
-generic-y += shmparam.h
generic-y += spinlock.h
-generic-y += statfs.h
-generic-y += termios.h
generic-y += topology.h
generic-y += trace_clock.h
-generic-y += types.h
generic-y += word-at-a-time.h
generic-y += xor.h
-generic-y += kprobes.h
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 68b45cc87e2c..3717b64a620d 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -2,11 +2,21 @@
include include/uapi/asm-generic/Kbuild.asm
generic-y += auxvec.h
+generic-y += bitsperlong.h
+generic-y += errno.h
+generic-y += ioctl.h
+generic-y += ipcbuf.h
+generic-y += kvm_para.h
+generic-y += mman.h
generic-y += msgbuf.h
+generic-y += resource.h
generic-y += sembuf.h
generic-y += shmbuf.h
+generic-y += shmparam.h
generic-y += siginfo.h
generic-y += socket.h
generic-y += sockios.h
+generic-y += statfs.h
generic-y += termbits.h
generic-y += termios.h
+generic-y += types.h
--
2.7.4
[toc] | [prev] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-07-09 20:40 +0200 |
| Subject | [PATCH v2 22/28] sparc: move generic-y of exported headers to uapi/asm/Kbuild |
| Message-ID | <u1phG-2Oe-73@gated-at.bofh.it> |
| In reply to | #1683812 |
Since commit fcc8487d477a ("uapi: export all headers under uapi
directories"), all (and only) headers under uapi directories are
exported, but asm-generic wrappers are still exceptions.
To complete de-coupling the uapi from kernel headers, move generic-y
of exported headers to uapi/asm/Kbuild.
With this change, "make headers_install" will just need to parse
uapi/asm/Kbuild to build up exported headers.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/sparc/include/asm/Kbuild | 1 -
arch/sparc/include/uapi/asm/Kbuild | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild
index e9e837bc3158..80ddc01f57ac 100644
--- a/arch/sparc/include/asm/Kbuild
+++ b/arch/sparc/include/asm/Kbuild
@@ -18,5 +18,4 @@ generic-y += preempt.h
generic-y += rwsem.h
generic-y += serial.h
generic-y += trace_clock.h
-generic-y += types.h
generic-y += word-at-a-time.h
diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild
index b15bf6bc0e94..2178c78c7c1a 100644
--- a/arch/sparc/include/uapi/asm/Kbuild
+++ b/arch/sparc/include/uapi/asm/Kbuild
@@ -1,2 +1,4 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+
+generic-y += types.h
--
2.7.4
[toc] | [prev] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-07-09 20:40 +0200 |
| Subject | [PATCH v2 06/28] arc: move generic-y of exported headers to uapi/asm/Kbuild |
| Message-ID | <u1phG-2Oe-75@gated-at.bofh.it> |
| In reply to | #1683812 |
Since commit fcc8487d477a ("uapi: export all headers under uapi
directories"), all (and only) headers under uapi directories are
exported, but asm-generic wrappers are still exceptions.
To complete de-coupling the uapi from kernel headers, move generic-y
of exported headers to uapi/asm/Kbuild.
With this change, "make headers_install" will just need to parse
uapi/asm/Kbuild to build up exported headers.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/arc/include/asm/Kbuild | 24 ------------------------
arch/arc/include/uapi/asm/Kbuild | 24 ++++++++++++++++++++++++
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/arch/arc/include/asm/Kbuild b/arch/arc/include/asm/Kbuild
index 3e74ca5e6402..353dae386b2f 100644
--- a/arch/arc/include/asm/Kbuild
+++ b/arch/arc/include/asm/Kbuild
@@ -1,51 +1,27 @@
-generic-y += auxvec.h
-generic-y += bitsperlong.h
generic-y += bugs.h
generic-y += clkdev.h
generic-y += device.h
generic-y += div64.h
generic-y += emergency-restart.h
-generic-y += errno.h
generic-y += extable.h
generic-y += fb.h
-generic-y += fcntl.h
generic-y += ftrace.h
generic-y += hardirq.h
generic-y += hw_irq.h
-generic-y += ioctl.h
-generic-y += ioctls.h
-generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += irq_work.h
generic-y += kmap_types.h
-generic-y += kvm_para.h
generic-y += local.h
generic-y += local64.h
generic-y += mcs_spinlock.h
generic-y += mm-arch-hooks.h
-generic-y += mman.h
-generic-y += msgbuf.h
generic-y += msi.h
-generic-y += param.h
generic-y += parport.h
generic-y += pci.h
generic-y += percpu.h
-generic-y += poll.h
-generic-y += posix_types.h
generic-y += preempt.h
-generic-y += resource.h
-generic-y += sembuf.h
-generic-y += shmbuf.h
-generic-y += socket.h
-generic-y += sockios.h
-generic-y += stat.h
-generic-y += statfs.h
-generic-y += termbits.h
-generic-y += termios.h
generic-y += topology.h
generic-y += trace_clock.h
-generic-y += types.h
-generic-y += ucontext.h
generic-y += user.h
generic-y += vga.h
generic-y += word-at-a-time.h
diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild
index b55fc2ae1e8c..fa6d0ff4ff89 100644
--- a/arch/arc/include/uapi/asm/Kbuild
+++ b/arch/arc/include/uapi/asm/Kbuild
@@ -1,4 +1,28 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+generic-y += auxvec.h
+generic-y += bitsperlong.h
+generic-y += errno.h
+generic-y += fcntl.h
+generic-y += ioctl.h
+generic-y += ioctls.h
+generic-y += ipcbuf.h
+generic-y += kvm_para.h
+generic-y += mman.h
+generic-y += msgbuf.h
+generic-y += param.h
+generic-y += poll.h
+generic-y += posix_types.h
+generic-y += resource.h
+generic-y += sembuf.h
+generic-y += shmbuf.h
generic-y += siginfo.h
+generic-y += socket.h
+generic-y += sockios.h
+generic-y += stat.h
+generic-y += statfs.h
+generic-y += termbits.h
+generic-y += termios.h
+generic-y += types.h
+generic-y += ucontext.h
--
2.7.4
[toc] | [prev] | [next] | [standalone]
| From | Sam Ravnborg <sam@ravnborg.org> |
|---|---|
| Date | 2017-07-10 10:50 +0200 |
| Subject | Re: [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst |
| Message-ID | <u1Cye-2Hm-9@gated-at.bofh.it> |
| In reply to | #1683812 |
Hi Masahiro. On Mon, Jul 10, 2017 at 03:32:32AM +0900, Masahiro Yamada wrote: > In v4.12-rc1, we had a big progress for headers_install. > All (and only) headers under UAPI directories are exported. > However, asm-generic wrappers are still exceptions because > most of arch/*/include/asm/Kbuild include "generic-y" for > exported headers. As a result, many of generic-wrappers to be > exported are generated outside UAPI directories. > > To finish de-coupling UAPI, "generic-y" for exported headers > should be moved to arch/*/include/uapi/asm/Kbuild. > > With those cleanups, the logic of headers_install will become > even simpler. UAPI will be completely self-contained. > > This series is based on: > commit 19bf2e0ef18ec8a7284ecc83459a2664cb885cd5 > > Changes for v2: > - rebase on the latest in the mainline in order to avoid merge conflicts Series looks good. In several of your patches assignments are moved to the arch specific uapi file, but the same assignment are already present in include/uapi/asm-generic/Kbuild.asm so the assignment is redundant. For example: $ARCH uapi Kbuild: generic-y += errno.h uapi/asm-generic Kbuild: mandatory-y += errno.h As this patch-set is touching all arch files this could be a good opportunity to clean this up too. But maybe mandatory-y and generic-y do something different, and both are needed. In wich cases all is good. Sam
[toc] | [prev] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-07-10 11:20 +0200 |
| Message-ID | <u1D1f-375-3@gated-at.bofh.it> |
| In reply to | #1684056 |
Hi Sam, 2017-07-10 17:42 GMT+09:00 Sam Ravnborg <sam@ravnborg.org>: > Hi Masahiro. > > On Mon, Jul 10, 2017 at 03:32:32AM +0900, Masahiro Yamada wrote: >> In v4.12-rc1, we had a big progress for headers_install. >> All (and only) headers under UAPI directories are exported. >> However, asm-generic wrappers are still exceptions because >> most of arch/*/include/asm/Kbuild include "generic-y" for >> exported headers. As a result, many of generic-wrappers to be >> exported are generated outside UAPI directories. >> >> To finish de-coupling UAPI, "generic-y" for exported headers >> should be moved to arch/*/include/uapi/asm/Kbuild. >> >> With those cleanups, the logic of headers_install will become >> even simpler. UAPI will be completely self-contained. >> >> This series is based on: >> commit 19bf2e0ef18ec8a7284ecc83459a2664cb885cd5 >> >> Changes for v2: >> - rebase on the latest in the mainline in order to avoid merge conflicts > > Series looks good. > > In several of your patches assignments are moved to the arch > specific uapi file, but the same assignment are already present in > include/uapi/asm-generic/Kbuild.asm so the assignment is redundant. > > For example: > $ARCH uapi Kbuild: > generic-y += errno.h > > uapi/asm-generic Kbuild: > mandatory-y += errno.h > > As this patch-set is touching all arch files this > could be a good opportunity to clean this up too. > > But maybe mandatory-y and generic-y do something different, > and both are needed. In wich cases all is good. > Thanks for your review, and you have a good point. If neither arch-own header implementation is found nor generic-y is specified, the build system can automatically generate generic wrappers for "mandatory" headers. I also considered of it, but I wanted to take my time. I simply moved generic-y without introducing any logical change in order to make this series less controversial. One point of forcing explicit generic-y might be, to give arch maintainers an opportunity to judge if falling back to asm-generic one works or not. -- Best Regards Masahiro Yamada
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web