* [PATCH v2 01/28] kbuild: remove useless $(gen) variable in Makefile.headersinst
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 02/28] kbuild: fix comment about dst of headers_{install,check}_all Masahiro Yamada
` (27 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
We have no true case for the $(if $(gen), ...) conditional. Drop it
to simplify the gendir calculation.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
| 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
--git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index c583a1e1bd3c..4e9287bfdf28 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -39,9 +39,6 @@ skip-inst := $(if $(filter %/uapi,$(obj)),1)
ifeq ($(skip-inst),)
-# generated header directory
-gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj)))
-
# Kbuild file is optional
kbuild-file := $(srctree)/$(obj)/Kbuild
-include $(kbuild-file)
@@ -53,7 +50,7 @@ endif
installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst))
-gendir := $(objtree)/$(gen)
+gendir := $(objtree)/$(subst include/,include/generated/,$(obj))
header-files := $(notdir $(wildcard $(srcdir)/*.h))
header-files += $(notdir $(wildcard $(srcdir)/*.agh))
header-files := $(filter-out $(no-export-headers), $(header-files))
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 02/28] kbuild: fix comment about dst of headers_{install,check}_all
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 01/28] kbuild: remove useless $(gen) variable in Makefile.headersinst Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 03/28] kbuild: pass dst= to Makefile.headersinst from top Makefile Masahiro Yamada
` (26 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
Commit 61562f981e92 ("uapi: export all arch specifics directories")
changed the dst from asm-<arch> to arch-<arch> for headers_install_all
or headers_check_all. Update the comment.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 06ef9947cf7c..ce5875628740 100644
--- a/Makefile
+++ b/Makefile
@@ -1133,7 +1133,7 @@ firmware_install:
#Default location for installed headers
export INSTALL_HDR_PATH = $(objtree)/usr
-# If we do an all arch process set dst to asm-$(hdr-arch)
+# If we do an all arch process set dst to include/arch-$(hdr-arch)
hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include)
PHONY += archheaders
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 03/28] kbuild: pass dst= to Makefile.headersinst from top Makefile
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 01/28] kbuild: remove useless $(gen) variable in Makefile.headersinst Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 02/28] kbuild: fix comment about dst of headers_{install,check}_all Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 04/28] arm64: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada
` (25 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
We can always pass dst= from the top Makefile. This will simplify
the logic in Makefile.headersinst.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
Makefile | 4 ++--
| 8 ++------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index ce5875628740..70c414b15859 100644
--- a/Makefile
+++ b/Makefile
@@ -1154,7 +1154,7 @@ PHONY += headers_install
headers_install: __headers
$(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \
$(error Headers not exportable for the $(SRCARCH) architecture))
- $(Q)$(MAKE) $(hdr-inst)=include/uapi
+ $(Q)$(MAKE) $(hdr-inst)=include/uapi dst=include
$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst)
PHONY += headers_check_all
@@ -1163,7 +1163,7 @@ headers_check_all: headers_install_all
PHONY += headers_check
headers_check: headers_install
- $(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1
+ $(Q)$(MAKE) $(hdr-inst)=include/uapi dst=include HDRCHECK=1
$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) HDRCHECK=1
# ---------------------------------------------------------------------------
--git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index 4e9287bfdf28..e9147f05ea77 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -23,15 +23,12 @@ subdirs := $(patsubst $(srcdir)/%/,%,\
$(filter-out $(srcdir)/,\
$(sort $(dir $(wildcard $(srcdir)/*/)))))
-# caller may set destination dir (when installing to asm/)
-_dst := $(if $(dst),$(dst),$(obj))
-
# Recursion
__headers: $(subdirs)
.PHONY: $(subdirs)
$(subdirs):
- $(Q)$(MAKE) $(hdr-inst)=$(obj)/$@ dst=$(_dst)/$@
+ $(Q)$(MAKE) $(hdr-inst)=$(obj)/$@ dst=$(dst)/$@
# Skip header install/check for include/uapi and arch/$(hdr-arch)/include/uapi.
# We have only sub-directories there.
@@ -48,8 +45,7 @@ ifneq ($(wildcard $(old-kbuild-file)),)
include $(old-kbuild-file)
endif
-installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst))
-
+installdir := $(INSTALL_HDR_PATH)/$(dst)
gendir := $(objtree)/$(subst include/,include/generated/,$(obj))
header-files := $(notdir $(wildcard $(srcdir)/*.h))
header-files += $(notdir $(wildcard $(srcdir)/*.agh))
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 04/28] arm64: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (2 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 03/28] kbuild: pass dst= to Makefile.headersinst from top Makefile Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 05/28] ARM: " Masahiro Yamada
` (24 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 05/28] ARM: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (3 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 04/28] arm64: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 06/28] arc: " Masahiro Yamada
` (23 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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/arm/include/asm/Kbuild | 16 ----------------
arch/arm/include/uapi/asm/Kbuild | 14 ++++++++++++++
2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index d8360501c082..721ab5ecfb9b 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -1,39 +1,23 @@
-
-
-generic-y += bitsperlong.h
generic-y += clkdev.h
generic-y += current.h
generic-y += early_ioremap.h
generic-y += emergency-restart.h
-generic-y += errno.h
generic-y += exec.h
generic-y += extable.h
-generic-y += ioctl.h
-generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += kdebug.h
generic-y += local.h
generic-y += local64.h
generic-y += mm-arch-hooks.h
-generic-y += msgbuf.h
generic-y += msi.h
-generic-y += param.h
generic-y += parport.h
-generic-y += poll.h
generic-y += preempt.h
-generic-y += resource.h
generic-y += rwsem.h
generic-y += seccomp.h
generic-y += segment.h
-generic-y += sembuf.h
generic-y += serial.h
-generic-y += shmbuf.h
generic-y += simd.h
generic-y += sizes.h
-generic-y += socket.h
-generic-y += sockios.h
-generic-y += termbits.h
-generic-y += termios.h
generic-y += timex.h
generic-y += trace_clock.h
generic-y += unaligned.h
diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild
index 5fb3368e70cb..8e17fe80b55b 100644
--- a/arch/arm/include/uapi/asm/Kbuild
+++ b/arch/arm/include/uapi/asm/Kbuild
@@ -5,4 +5,18 @@ generated-y += unistd-common.h
generated-y += unistd-oabi.h
generated-y += unistd-eabi.h
+generic-y += bitsperlong.h
+generic-y += errno.h
+generic-y += ioctl.h
+generic-y += ipcbuf.h
+generic-y += msgbuf.h
+generic-y += param.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 += termbits.h
+generic-y += termios.h
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 06/28] arc: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (4 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 05/28] ARM: " Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 07/28] blackfin: " Masahiro Yamada
` (22 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 07/28] blackfin: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (5 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 06/28] arc: " Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 08/28] c6x: " Masahiro Yamada
` (21 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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/blackfin/include/asm/Kbuild | 24 +-----------------------
arch/blackfin/include/uapi/asm/Kbuild | 22 ++++++++++++++++++++++
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/arch/blackfin/include/asm/Kbuild b/arch/blackfin/include/asm/Kbuild
index dc4ef9ac1e83..fe736973630f 100644
--- a/arch/blackfin/include/asm/Kbuild
+++ b/arch/blackfin/include/asm/Kbuild
@@ -1,50 +1,28 @@
-
-generic-y += auxvec.h
-generic-y += bitsperlong.h
generic-y += bugs.h
generic-y += current.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 += 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 += msgbuf.h
-generic-y += param.h
generic-y += percpu.h
generic-y += pgalloc.h
generic-y += preempt.h
-generic-y += resource.h
-generic-y += sembuf.h
generic-y += serial.h
-generic-y += setup.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 += 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 += word-at-a-time.h
generic-y += xor.h
-generic-y += kprobes.h
diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild
index b15bf6bc0e94..aa624b4ab655 100644
--- a/arch/blackfin/include/uapi/asm/Kbuild
+++ b/arch/blackfin/include/uapi/asm/Kbuild
@@ -1,2 +1,24 @@
# 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 += ioctl.h
+generic-y += ipcbuf.h
+generic-y += kvm_para.h
+generic-y += mman.h
+generic-y += msgbuf.h
+generic-y += param.h
+generic-y += resource.h
+generic-y += sembuf.h
+generic-y += setup.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
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 08/28] c6x: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (6 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 07/28] blackfin: " Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 09/28] cris: " Masahiro Yamada
` (20 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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/c6x/include/asm/Kbuild | 28 +---------------------------
arch/c6x/include/uapi/asm/Kbuild | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
index a3c8d05c4cc7..d717329c8cf9 100644
--- a/arch/c6x/include/asm/Kbuild
+++ b/arch/c6x/include/asm/Kbuild
@@ -1,8 +1,5 @@
-
generic-y += atomic.h
-generic-y += auxvec.h
generic-y += barrier.h
-generic-y += bitsperlong.h
generic-y += bugs.h
generic-y += clkdev.h
generic-y += current.h
@@ -10,55 +7,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 += futex.h
generic-y += hw_irq.h
generic-y += io.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 += mmu.h
generic-y += mmu_context.h
-generic-y += msgbuf.h
-generic-y += param.h
generic-y += pci.h
generic-y += percpu.h
generic-y += pgalloc.h
-generic-y += poll.h
-generic-y += posix_types.h
generic-y += preempt.h
-generic-y += resource.h
generic-y += segment.h
-generic-y += sembuf.h
generic-y += serial.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 += termbits.h
-generic-y += termios.h
generic-y += tlbflush.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/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild
index 1c44d3b3eba0..67ee896a76a7 100644
--- a/arch/c6x/include/uapi/asm/Kbuild
+++ b/arch/c6x/include/uapi/asm/Kbuild
@@ -1,5 +1,30 @@
# 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 += 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 += termbits.h
+generic-y += termios.h
+generic-y += types.h
+generic-y += ucontext.h
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 09/28] cris: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (7 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 08/28] c6x: " Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 10/28] h8300: " Masahiro Yamada
` (19 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 10/28] h8300: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (8 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 09/28] cris: " Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 11/28] hexagon: " Masahiro Yamada
` (18 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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" and "generic-y += trace_clock.h"
in order to keep the entries sorted.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/h8300/include/asm/Kbuild | 30 ++----------------------------
arch/h8300/include/uapi/asm/Kbuild | 26 ++++++++++++++++++++++++++
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild
index 99c824608a31..bc077491d299 100644
--- a/arch/h8300/include/asm/Kbuild
+++ b/arch/h8300/include/asm/Kbuild
@@ -1,5 +1,4 @@
generic-y += asm-offsets.h
-generic-y += auxvec.h
generic-y += barrier.h
generic-y += bugs.h
generic-y += cacheflush.h
@@ -11,66 +10,41 @@ 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 += futex.h
generic-y += hardirq.h
generic-y += hash.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 += 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 += mmu.h
generic-y += mmu_context.h
generic-y += module.h
-generic-y += msgbuf.h
-generic-y += param.h
generic-y += parport.h
generic-y += percpu.h
generic-y += pgalloc.h
-generic-y += poll.h
-generic-y += posix_types.h
generic-y += preempt.h
-generic-y += resource.h
generic-y += scatterlist.h
generic-y += sections.h
-generic-y += sembuf.h
generic-y += serial.h
-generic-y += setup.h
-generic-y += shmbuf.h
-generic-y += shmparam.h
generic-y += sizes.h
-generic-y += socket.h
-generic-y += sockios.h
generic-y += spinlock.h
-generic-y += stat.h
-generic-y += statfs.h
-generic-y += swab.h
-generic-y += termbits.h
-generic-y += termios.h
generic-y += timex.h
generic-y += tlbflush.h
-generic-y += trace_clock.h
generic-y += topology.h
-generic-y += types.h
-generic-y += ucontext.h
+generic-y += trace_clock.h
generic-y += unaligned.h
generic-y += vga.h
generic-y += word-at-a-time.h
generic-y += xor.h
-generic-y += kprobes.h
diff --git a/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild
index b55fc2ae1e8c..187aed820e71 100644
--- a/arch/h8300/include/uapi/asm/Kbuild
+++ b/arch/h8300/include/uapi/asm/Kbuild
@@ -1,4 +1,30 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+generic-y += auxvec.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 += 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
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 11/28] hexagon: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (9 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 10/28] h8300: " Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 12/28] ia64: remove redundant generic-y += kvm_para.h from asm/Kbuild Masahiro Yamada
` (17 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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/hexagon/include/asm/Kbuild | 24 +-----------------------
arch/hexagon/include/uapi/asm/Kbuild | 22 ++++++++++++++++++++++
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild
index 0fc9cb04e6ad..34013683d123 100644
--- a/arch/hexagon/include/asm/Kbuild
+++ b/arch/hexagon/include/asm/Kbuild
@@ -1,4 +1,3 @@
-generic-y += auxvec.h
generic-y += barrier.h
generic-y += bug.h
generic-y += bugs.h
@@ -7,53 +6,32 @@ generic-y += current.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 += iomap.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 += local64.h
generic-y += mcs_spinlock.h
generic-y += mm-arch-hooks.h
-generic-y += mman.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 += rwsem.h
generic-y += sections.h
generic-y += segment.h
-generic-y += sembuf.h
generic-y += serial.h
-generic-y += shmbuf.h
-generic-y += shmparam.h
generic-y += sizes.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 += unaligned.h
generic-y += vga.h
generic-y += word-at-a-time.h
generic-y += xor.h
-generic-y += kprobes.h
diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild
index b55fc2ae1e8c..cb5df3aad3a8 100644
--- a/arch/hexagon/include/uapi/asm/Kbuild
+++ b/arch/hexagon/include/uapi/asm/Kbuild
@@ -1,4 +1,26 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+generic-y += auxvec.h
+generic-y += errno.h
+generic-y += fcntl.h
+generic-y += ioctl.h
+generic-y += ioctls.h
+generic-y += ipcbuf.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 += shmbuf.h
+generic-y += shmparam.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
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 12/28] ia64: remove redundant generic-y += kvm_para.h from asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (10 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 11/28] hexagon: " Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 13/28] m32r: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada
` (16 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
"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
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 13/28] m32r: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (11 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 12/28] ia64: remove redundant generic-y += kvm_para.h from asm/Kbuild Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 14/28] m68k: " Masahiro Yamada
` (15 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 14/28] m68k: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (12 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 13/28] m32r: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 15/28] metag: " Masahiro Yamada
` (14 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 15/28] metag: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (13 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 14/28] m68k: " Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 16/28] microblaze: " Masahiro Yamada
` (13 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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/metag/include/asm/Kbuild | 26 +-------------------------
arch/metag/include/uapi/asm/Kbuild | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/arch/metag/include/asm/Kbuild b/arch/metag/include/asm/Kbuild
index 8f940553a579..3fba97ed9bb2 100644
--- a/arch/metag/include/asm/Kbuild
+++ b/arch/metag/include/asm/Kbuild
@@ -1,58 +1,34 @@
-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 += 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 += 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 += 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 += msgbuf.h
-generic-y += param.h
generic-y += pci.h
generic-y += percpu.h
-generic-y += poll.h
-generic-y += posix_types.h
generic-y += preempt.h
generic-y += sections.h
-generic-y += sembuf.h
generic-y += serial.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 += switch_to.h
-generic-y += termbits.h
-generic-y += termios.h
generic-y += timex.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/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild
index b29731ebd7a9..6ac763d9a3e3 100644
--- a/arch/metag/include/uapi/asm/Kbuild
+++ b/arch/metag/include/uapi/asm/Kbuild
@@ -1,6 +1,30 @@
# 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 += signal.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
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 16/28] microblaze: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (14 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 15/28] metag: " Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 17/28] nios2: remove unneeded arch/nios2/include/(generated/)asm/signal.h Masahiro Yamada
` (12 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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 microblaze, "generic-y += siginfo.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>
---
arch/microblaze/include/asm/Kbuild | 25 -------------------------
arch/microblaze/include/uapi/asm/Kbuild | 25 ++++++++++++++++++++++++-
2 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild
index 83a4ef3a2495..9d66f7793841 100644
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@ -1,22 +1,15 @@
-
generic-y += barrier.h
generic-y += bitops.h
-generic-y += bitsperlong.h
generic-y += bug.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 += exec.h
generic-y += extable.h
generic-y += fb.h
-generic-y += fcntl.h
generic-y += hardirq.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
@@ -27,31 +20,13 @@ 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 += param.h
generic-y += parport.h
generic-y += percpu.h
-generic-y += poll.h
generic-y += preempt.h
-generic-y += resource.h
-generic-y += sembuf.h
generic-y += serial.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 += syscalls.h
-generic-y += termbits.h
-generic-y += termios.h
generic-y += topology.h
generic-y += trace_clock.h
-generic-y += ucontext.h
generic-y += vga.h
generic-y += word-at-a-time.h
generic-y += xor.h
diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild
index cb6784f4a427..e77a596f3f1e 100644
--- a/arch/microblaze/include/uapi/asm/Kbuild
+++ b/arch/microblaze/include/uapi/asm/Kbuild
@@ -1,5 +1,28 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-generic-y += types.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 += mman.h
+generic-y += msgbuf.h
+generic-y += param.h
+generic-y += poll.h
+generic-y += resource.h
+generic-y += sembuf.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
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 17/28] nios2: remove unneeded arch/nios2/include/(generated/)asm/signal.h
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (15 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 16/28] microblaze: " Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-11 9:19 ` Tobias Klauser
2017-07-09 18:32 ` [PATCH v2 18/28] nios2: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada
` (11 subsequent siblings)
28 siblings, 1 reply; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
Currently, NIOS2 has three signal.h files under arch/nios2/include:
[1] arch/nios2/include/asm/signal.h
[2] arch/nios2/include/uapi/asm/signal.h
[3] arch/nios2/include/generated/asm/signal.h
[3] is build-time generated by scripts/Makefile.asm-generic.
However, -I$(srctree)/arch/$(hdr-arch)/include search path is listed
before -I$(objtree)/arch/$(hdr-arch)/include/generated in LINUXINCLUDE.
Therefore [1] is always included instead of [3]. Remove [3] which
is never included.
If we look at [1], it just includes [2]. So, [1] can be removed
as well.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/nios2/include/asm/Kbuild | 1 -
arch/nios2/include/asm/signal.h | 22 ----------------------
2 files changed, 23 deletions(-)
delete mode 100644 arch/nios2/include/asm/signal.h
diff --git a/arch/nios2/include/asm/Kbuild b/arch/nios2/include/asm/Kbuild
index e1a843def56f..c1c7f6736117 100644
--- a/arch/nios2/include/asm/Kbuild
+++ b/arch/nios2/include/asm/Kbuild
@@ -47,7 +47,6 @@ generic-y += segment.h
generic-y += sembuf.h
generic-y += serial.h
generic-y += shmbuf.h
-generic-y += signal.h
generic-y += socket.h
generic-y += sockios.h
generic-y += spinlock.h
diff --git a/arch/nios2/include/asm/signal.h b/arch/nios2/include/asm/signal.h
deleted file mode 100644
index bbcf11eecb01..000000000000
--- a/arch/nios2/include/asm/signal.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Altera Corporation (C) 2013. All rights reserved
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#ifndef _NIOS2_SIGNAL_H
-#define _NIOS2_SIGNAL_H
-
-#include <uapi/asm/signal.h>
-
-#endif /* _NIOS2_SIGNAL_H */
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v2 17/28] nios2: remove unneeded arch/nios2/include/(generated/)asm/signal.h
2017-07-09 18:32 ` [PATCH v2 17/28] nios2: remove unneeded arch/nios2/include/(generated/)asm/signal.h Masahiro Yamada
@ 2017-07-11 9:19 ` Tobias Klauser
0 siblings, 0 replies; 34+ messages in thread
From: Tobias Klauser @ 2017-07-11 9:19 UTC (permalink / raw)
To: Masahiro Yamada; +Cc: linux-kbuild, linux-arch, linux-kernel
On 2017-07-09 at 20:32:49 +0200, Masahiro Yamada <yamada.masahiro@socionext.com> wrote:
> Currently, NIOS2 has three signal.h files under arch/nios2/include:
>
> [1] arch/nios2/include/asm/signal.h
> [2] arch/nios2/include/uapi/asm/signal.h
> [3] arch/nios2/include/generated/asm/signal.h
>
> [3] is build-time generated by scripts/Makefile.asm-generic.
> However, -I$(srctree)/arch/$(hdr-arch)/include search path is listed
> before -I$(objtree)/arch/$(hdr-arch)/include/generated in LINUXINCLUDE.
> Therefore [1] is always included instead of [3]. Remove [3] which
> is never included.
>
> If we look at [1], it just includes [2]. So, [1] can be removed
> as well.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Tobias Klauser <tklauser@distanz.ch>
Looks good, thanks!
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 18/28] nios2: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (16 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 17/28] nios2: remove unneeded arch/nios2/include/(generated/)asm/signal.h Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-11 9:20 ` Tobias Klauser
2017-07-09 18:32 ` [PATCH v2 19/28] openrisc: " Masahiro Yamada
` (10 subsequent siblings)
28 siblings, 1 reply; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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/nios2/include/asm/Kbuild | 25 +------------------------
arch/nios2/include/uapi/asm/Kbuild | 23 +++++++++++++++++++++++
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/arch/nios2/include/asm/Kbuild b/arch/nios2/include/asm/Kbuild
index c1c7f6736117..896c26ae0da9 100644
--- a/arch/nios2/include/asm/Kbuild
+++ b/arch/nios2/include/asm/Kbuild
@@ -1,8 +1,6 @@
generic-y += atomic.h
-generic-y += auxvec.h
generic-y += barrier.h
generic-y += bitops.h
-generic-y += bitsperlong.h
generic-y += bug.h
generic-y += bugs.h
generic-y += clkdev.h
@@ -12,54 +10,33 @@ 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 += 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 += 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 += param.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 += serial.h
-generic-y += shmbuf.h
-generic-y += socket.h
-generic-y += sockios.h
generic-y += spinlock.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 += 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/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild
index 51eff5bc2eb4..ffca24da7647 100644
--- a/arch/nios2/include/uapi/asm/Kbuild
+++ b/arch/nios2/include/uapi/asm/Kbuild
@@ -1,6 +1,29 @@
# 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 += 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
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v2 18/28] nios2: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 ` [PATCH v2 18/28] nios2: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada
@ 2017-07-11 9:20 ` Tobias Klauser
0 siblings, 0 replies; 34+ messages in thread
From: Tobias Klauser @ 2017-07-11 9:20 UTC (permalink / raw)
To: Masahiro Yamada; +Cc: linux-kbuild, linux-arch, linux-kernel
On 2017-07-09 at 20:32:50 +0200, Masahiro Yamada <yamada.masahiro@socionext.com> 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.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Tobias Klauser <tklauser@distanz.ch>
Looks good, thanks!
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 19/28] openrisc: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (17 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 18/28] nios2: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-10 20:21 ` Stafford Horne
2017-07-09 18:32 ` [PATCH v2 20/28] parisc: " Masahiro Yamada
` (9 subsequent siblings)
28 siblings, 1 reply; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v2 19/28] openrisc: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 ` [PATCH v2 19/28] openrisc: " Masahiro Yamada
@ 2017-07-10 20:21 ` Stafford Horne
0 siblings, 0 replies; 34+ messages in thread
From: Stafford Horne @ 2017-07-10 20:21 UTC (permalink / raw)
To: Masahiro Yamada; +Cc: linux-kbuild, linux-arch, linux-kernel
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>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 20/28] parisc: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (18 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 19/28] openrisc: " Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 21/28] sh: " Masahiro Yamada
` (8 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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/parisc/include/asm/Kbuild | 7 +------
arch/parisc/include/uapi/asm/Kbuild | 4 ++++
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
index a9909c2d04c5..a41139575ab4 100644
--- a/arch/parisc/include/asm/Kbuild
+++ b/arch/parisc/include/asm/Kbuild
@@ -1,5 +1,3 @@
-
-generic-y += auxvec.h
generic-y += barrier.h
generic-y += clkdev.h
generic-y += current.h
@@ -11,14 +9,12 @@ generic-y += hw_irq.h
generic-y += irq_regs.h
generic-y += irq_work.h
generic-y += kdebug.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 += param.h
generic-y += percpu.h
-generic-y += poll.h
generic-y += preempt.h
generic-y += seccomp.h
generic-y += segment.h
@@ -28,4 +24,3 @@ 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/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild
index 3971c60a7e7f..196d2a4efb31 100644
--- a/arch/parisc/include/uapi/asm/Kbuild
+++ b/arch/parisc/include/uapi/asm/Kbuild
@@ -1,4 +1,8 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+generic-y += auxvec.h
+generic-y += kvm_para.h
+generic-y += param.h
+generic-y += poll.h
generic-y += resource.h
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 21/28] sh: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (19 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 20/28] parisc: " Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 22/28] sparc: " Masahiro Yamada
` (7 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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/sh/include/asm/Kbuild | 19 -------------------
arch/sh/include/uapi/asm/Kbuild | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/arch/sh/include/asm/Kbuild b/arch/sh/include/asm/Kbuild
index 590c91ae7541..1a6f9c39feef 100644
--- a/arch/sh/include/asm/Kbuild
+++ b/arch/sh/include/asm/Kbuild
@@ -1,39 +1,20 @@
-
-generic-y += bitsperlong.h
generic-y += clkdev.h
generic-y += current.h
generic-y += delay.h
generic-y += div64.h
generic-y += emergency-restart.h
-generic-y += errno.h
generic-y += exec.h
-generic-y += fcntl.h
-generic-y += ioctl.h
-generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += irq_work.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 += param.h
generic-y += parport.h
generic-y += percpu.h
-generic-y += poll.h
generic-y += preempt.h
-generic-y += resource.h
generic-y += rwsem.h
-generic-y += sembuf.h
generic-y += serial.h
-generic-y += shmbuf.h
generic-y += sizes.h
-generic-y += socket.h
-generic-y += statfs.h
-generic-y += termbits.h
-generic-y += termios.h
generic-y += trace_clock.h
-generic-y += ucontext.h
generic-y += xor.h
diff --git a/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild
index b55fc2ae1e8c..e28531333efa 100644
--- a/arch/sh/include/uapi/asm/Kbuild
+++ b/arch/sh/include/uapi/asm/Kbuild
@@ -1,4 +1,22 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+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 += param.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 += statfs.h
+generic-y += termbits.h
+generic-y += termios.h
+generic-y += ucontext.h
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 22/28] sparc: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (20 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 21/28] sh: " Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 23/28] tile: " Masahiro Yamada
` (6 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 23/28] tile: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (21 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 22/28] sparc: " Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 24/28] unicore32: " Masahiro Yamada
` (5 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 24/28] unicore32: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (22 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 23/28] tile: " Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 25/28] xtensa: " Masahiro Yamada
` (4 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 25/28] xtensa: move generic-y of exported headers to uapi/asm/Kbuild
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (23 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 24/28] unicore32: " Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 26/28] kbuild: do not include old-kbuild-file from Makefile.headersinst Masahiro Yamada
` (3 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
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/xtensa/include/asm/Kbuild | 10 +---------
arch/xtensa/include/uapi/asm/Kbuild | 9 +++++++++
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild
index 30f6290109d4..c04efde775a5 100644
--- a/arch/xtensa/include/asm/Kbuild
+++ b/arch/xtensa/include/asm/Kbuild
@@ -1,20 +1,16 @@
-generic-y += bitsperlong.h
generic-y += bug.h
generic-y += clkdev.h
generic-y += div64.h
generic-y += dma-contiguous.h
generic-y += emergency-restart.h
-generic-y += errno.h
generic-y += exec.h
generic-y += extable.h
-generic-y += fcntl.h
generic-y += hardirq.h
-generic-y += ioctl.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
@@ -22,13 +18,9 @@ generic-y += mcs_spinlock.h
generic-y += mm-arch-hooks.h
generic-y += percpu.h
generic-y += preempt.h
-generic-y += resource.h
generic-y += rwsem.h
generic-y += sections.h
-generic-y += statfs.h
-generic-y += termios.h
generic-y += topology.h
generic-y += trace_clock.h
generic-y += word-at-a-time.h
generic-y += xor.h
-generic-y += kprobes.h
diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild
index 4cb0d2f8868c..a5bcdfb890f1 100644
--- a/arch/xtensa/include/uapi/asm/Kbuild
+++ b/arch/xtensa/include/uapi/asm/Kbuild
@@ -1,3 +1,12 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+
+generic-y += bitsperlong.h
+generic-y += errno.h
+generic-y += fcntl.h
+generic-y += ioctl.h
+generic-y += kvm_para.h
+generic-y += resource.h
generic-y += siginfo.h
+generic-y += statfs.h
+generic-y += termios.h
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 26/28] kbuild: do not include old-kbuild-file from Makefile.headersinst
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (24 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 25/28] xtensa: " Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 27/28] kbuild: split exported generic header creation into uapi-asm-generic Masahiro Yamada
` (2 subsequent siblings)
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
Now asm-generic wrappers to be exported are all listed in
arch/*/include/uapi/asm/Kbuild. "make headers_install" no longer
depends on any Kbuild files outside uapi directories.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
| 5 -----
1 file changed, 5 deletions(-)
--git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index e9147f05ea77..e6343b34182a 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -40,11 +40,6 @@ ifeq ($(skip-inst),)
kbuild-file := $(srctree)/$(obj)/Kbuild
-include $(kbuild-file)
-old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild
-ifneq ($(wildcard $(old-kbuild-file)),)
-include $(old-kbuild-file)
-endif
-
installdir := $(INSTALL_HDR_PATH)/$(dst)
gendir := $(objtree)/$(subst include/,include/generated/,$(obj))
header-files := $(notdir $(wildcard $(srcdir)/*.h))
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 27/28] kbuild: split exported generic header creation into uapi-asm-generic
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (25 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 26/28] kbuild: do not include old-kbuild-file from Makefile.headersinst Masahiro Yamada
@ 2017-07-09 18:32 ` Masahiro Yamada
2017-07-09 18:33 ` [PATCH v2 28/28] kbuild: remove wrapper files handling from Makefile.headersinst Masahiro Yamada
2017-07-10 8:42 ` [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Sam Ravnborg
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
When we install headers, we are interested only in headers under uapi
directories. Split out uapi-asm-generic target and make headers_install
depend on it. It will avoid generating unneeded asm-generic wrappers.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
Makefile | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 70c414b15859..f75a93fa9975 100644
--- a/Makefile
+++ b/Makefile
@@ -456,10 +456,11 @@ ifneq ($(KBUILD_SRC),)
endif
# Support for using generic headers in asm-generic
-PHONY += asm-generic
-asm-generic:
+PHONY += asm-generic uapi-asm-generic
+asm-generic: uapi-asm-generic
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
src=asm obj=arch/$(SRCARCH)/include/generated/asm
+uapi-asm-generic:
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
src=uapi/asm obj=arch/$(SRCARCH)/include/generated/uapi/asm
@@ -1143,7 +1144,7 @@ PHONY += archscripts
archscripts:
PHONY += __headers
-__headers: $(version_h) scripts_basic asm-generic archheaders archscripts
+__headers: $(version_h) scripts_basic uapi-asm-generic archheaders archscripts
$(Q)$(MAKE) $(build)=scripts build_unifdef
PHONY += headers_install_all
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 28/28] kbuild: remove wrapper files handling from Makefile.headersinst
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (26 preceding siblings ...)
2017-07-09 18:32 ` [PATCH v2 27/28] kbuild: split exported generic header creation into uapi-asm-generic Masahiro Yamada
@ 2017-07-09 18:33 ` Masahiro Yamada
2017-07-10 8:42 ` [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Sam Ravnborg
28 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-09 18:33 UTC (permalink / raw)
To: linux-kbuild; +Cc: linux-arch, Masahiro Yamada, linux-kernel
scripts/Makefike.headersinst creates asm-generic wrappers by itself
because scripts/Makefile.asm-generic created some of exported wrappers
outside uapi directories.
Now this distortion has been fixed. scripts/Makefile.headersinst can
simply copy wrappers created by scripts/Makefile.asm-generic.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
| 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
--git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index e6343b34182a..343d586e566e 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -52,14 +52,8 @@ genhdr-files := $(filter-out $(header-files), $(genhdr-files))
install-file := $(installdir)/.install
check-file := $(installdir)/.check
-# generic-y list all files an architecture uses from asm-generic
-# Use this to build a list of headers which require a wrapper
-generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h))
-wrapper-files := $(filter $(generic-files), $(generic-y))
-wrapper-files := $(filter-out $(header-files), $(wrapper-files))
-
# all headers files for this dir
-all-files := $(header-files) $(genhdr-files) $(wrapper-files)
+all-files := $(header-files) $(genhdr-files)
output-files := $(addprefix $(installdir)/, $(all-files))
ifneq ($(mandatory-y),)
@@ -83,9 +77,6 @@ quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
cmd_install = \
$(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \
$(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \
- for F in $(wrapper-files); do \
- echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \
- done; \
touch $@
quiet_cmd_remove = REMOVE $(unwanted)
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
` (27 preceding siblings ...)
2017-07-09 18:33 ` [PATCH v2 28/28] kbuild: remove wrapper files handling from Makefile.headersinst Masahiro Yamada
@ 2017-07-10 8:42 ` Sam Ravnborg
2017-07-10 9:12 ` Masahiro Yamada
28 siblings, 1 reply; 34+ messages in thread
From: Sam Ravnborg @ 2017-07-10 8:42 UTC (permalink / raw)
To: Masahiro Yamada; +Cc: linux-kbuild, linux-arch, linux-kernel
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
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst
2017-07-10 8:42 ` [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Sam Ravnborg
@ 2017-07-10 9:12 ` Masahiro Yamada
0 siblings, 0 replies; 34+ messages in thread
From: Masahiro Yamada @ 2017-07-10 9:12 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Linux Kbuild mailing list, linux-arch, Linux Kernel Mailing List
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
^ permalink raw reply [flat|nested] 34+ messages in thread