Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1663223 > unrolled thread
| Started by | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| First post | 2017-06-12 05:40 +0200 |
| Last post | 2017-06-12 05:40 +0200 |
| Articles | 7 — 1 participant |
Back to article view | Back to linux.kernel
[PATCH 00/27] kbuild, arch: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-06-12 05:40 +0200
[PATCH 26/27] kbuild: split exported generic header creation into uapi-asm-generic Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-06-12 05:40 +0200
[PATCH 24/27] xtensa: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-06-12 05:40 +0200
[PATCH 10/27] h8300: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-06-12 05:40 +0200
[PATCH 09/27] cris: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-06-12 05:40 +0200
[PATCH 01/27] kbuild: remove useless $(gen) variable in Makefile.headersinst Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-06-12 05:40 +0200
[PATCH 20/27] sh: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-06-12 05:40 +0200
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-06-12 05:40 +0200 |
| Subject | [PATCH 00/27] kbuild, arch: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst |
| Message-ID | <tRodb-5eV-3@gated-at.bofh.it> |
In v4.12-rc1, we had a big progress for headers_install.
All (and only) headers under UAPI directories are exported.
However, asm-generic wrappers are still exceptions because
most of arch/*/include/asm/Kbuild include "generic-y" for
exported headers. As a result, many of generic-wrappers to be
exported are generated outside UAPI directories.
To finish de-coupling UAPI, "generic-y" for exported headers
should be moved to arch/*/include/uapi/asm/Kbuild.
With those cleanups, the logic of headers_install will become
even simpler. UAPI will be completely self-contained.
This series is based on v4.12-rc2 tag.
This series touches Kbuild files under arch/. We have two options
to merge this series.
[1] I will collect Acked-by from arch maintainers, then apply the
whole series to the Kbuild tree.
[2] I will ask arch maintainers to pick up arch changes (for v4.13),
then apply Makefile changes to the Kbuild tree (for v4.14).
[1] will finish this work by v4.13, but need to deal with some conflicts.
[2] will allow us to reduce conflicts (still a bit conflicts),
but take more time to finish this work.
If arch maintainers ack [1], I can manage conflicts
before sending a pull request to Linus.
Masahiro Yamada (27):
kbuild: remove useless $(gen) variable in Makefile.headersinst
kbuild: fix comment about dst of headers_{install,check}_all
kbuild: pass dst= to Makefile.headersinst from top Makefile
arm64: move generic-y of exported headers to uapi/asm/Kbuild
ARM: move generic-y of exported headers to uapi/asm/Kbuild
arc: move generic-y of exported headers to uapi/asm/Kbuild
blackfin: move generic-y of exported headers to uapi/asm/Kbuild
c6x: move generic-y of exported headers to uapi/asm/Kbuild
cris: move generic-y of exported headers to uapi/asm/Kbuild
h8300: move generic-y of exported headers to uapi/asm/Kbuild
hexagon: move generic-y of exported headers to uapi/asm/Kbuild
ia64: move generic-y of exported headers to uapi/asm/Kbuild
m32r: move generic-y of exported headers to uapi/asm/Kbuild
m68k: move generic-y of exported headers to uapi/asm/Kbuild
metag: move generic-y of exported headers to uapi/asm/Kbuild
nios2: remove unneeded arch/nios2/include/(generated/)asm/signal.h
nios2: move generic-y of exported headers to uapi/asm/Kbuild
openrisc: move generic-y of exported headers to uapi/asm/Kbuild
parisc: move generic-y of exported headers to uapi/asm/Kbuild
sh: move generic-y of exported headers to uapi/asm/Kbuild
sparc: move generic-y of exported headers to uapi/asm/Kbuild
tile: move generic-y of exported headers to uapi/asm/Kbuild
unicore32: move generic-y of exported headers to uapi/asm/Kbuild
xtensa: move generic-y of exported headers to uapi/asm/Kbuild
kbuild: do not include old-kbuild-file from Makefile.headersinst
kbuild: split exported generic header creation into uapi-asm-generic
kbuild: remove wrapper files handling from Makefile.headersinst
Makefile | 13 +++++++------
arch/arc/include/asm/Kbuild | 25 -------------------------
arch/arc/include/uapi/asm/Kbuild | 26 ++++++++++++++++++++++++++
arch/arm/include/asm/Kbuild | 17 -----------------
arch/arm/include/uapi/asm/Kbuild | 16 ++++++++++++++++
arch/arm64/include/asm/Kbuild | 17 -----------------
arch/arm64/include/uapi/asm/Kbuild | 16 ++++++++++++++++
arch/blackfin/include/asm/Kbuild | 22 ----------------------
arch/blackfin/include/uapi/asm/Kbuild | 22 ++++++++++++++++++++++
arch/c6x/include/asm/Kbuild | 27 ---------------------------
arch/c6x/include/uapi/asm/Kbuild | 26 ++++++++++++++++++++++++++
arch/cris/include/asm/Kbuild | 18 ------------------
arch/cris/include/uapi/asm/Kbuild | 19 +++++++++++++++++++
arch/h8300/include/asm/Kbuild | 27 ---------------------------
arch/h8300/include/uapi/asm/Kbuild | 28 ++++++++++++++++++++++++++++
arch/hexagon/include/asm/Kbuild | 23 -----------------------
arch/hexagon/include/uapi/asm/Kbuild | 24 ++++++++++++++++++++++++
arch/ia64/include/asm/Kbuild | 2 --
arch/m32r/include/asm/Kbuild | 2 --
arch/m32r/include/uapi/asm/Kbuild | 2 ++
arch/m68k/include/asm/Kbuild | 12 ------------
arch/m68k/include/uapi/asm/Kbuild | 11 +++++++++++
arch/metag/include/asm/Kbuild | 24 ------------------------
arch/metag/include/uapi/asm/Kbuild | 24 ++++++++++++++++++++++++
arch/nios2/include/asm/Kbuild | 25 -------------------------
arch/nios2/include/asm/signal.h | 22 ----------------------
arch/nios2/include/uapi/asm/Kbuild | 24 ++++++++++++++++++++++++
arch/openrisc/include/asm/Kbuild | 28 ----------------------------
arch/openrisc/include/uapi/asm/Kbuild | 29 +++++++++++++++++++++++++++++
arch/parisc/include/asm/Kbuild | 5 -----
arch/parisc/include/uapi/asm/Kbuild | 4 ++++
arch/sh/include/asm/Kbuild | 20 --------------------
arch/sh/include/uapi/asm/Kbuild | 20 ++++++++++++++++++++
arch/sparc/include/asm/Kbuild | 1 -
arch/sparc/include/uapi/asm/Kbuild | 2 ++
arch/tile/include/asm/Kbuild | 19 -------------------
arch/tile/include/uapi/asm/Kbuild | 19 +++++++++++++++++++
arch/unicore32/include/asm/Kbuild | 31 +------------------------------
arch/unicore32/include/uapi/asm/Kbuild | 28 ++++++++++++++++++++++++++++
arch/xtensa/include/asm/Kbuild | 9 ---------
arch/xtensa/include/uapi/asm/Kbuild | 10 ++++++++++
scripts/Makefile.headersinst | 28 ++++------------------------
42 files changed, 362 insertions(+), 405 deletions(-)
delete mode 100644 arch/nios2/include/asm/signal.h
--
2.7.4
[toc] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-06-12 05:40 +0200 |
| Subject | [PATCH 26/27] kbuild: split exported generic header creation into uapi-asm-generic |
| Message-ID | <tRomT-5hX-25@gated-at.bofh.it> |
| In reply to | #1663223 |
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 1bb8c07db134..4fe556511c0d 100644 --- a/Makefile +++ b/Makefile @@ -465,10 +465,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 @@ -1151,7 +1152,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
[toc] | [prev] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-06-12 05:40 +0200 |
| Subject | [PATCH 24/27] xtensa: move generic-y of exported headers to uapi/asm/Kbuild |
| Message-ID | <tRomT-5hX-29@gated-at.bofh.it> |
| In reply to | #1663223 |
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.
scripts/Makefile.headersinst still need to deal with old-kbuild-file
for headers listed in arch/*/include/asm/Kbuild, but actually exported.
As the last work to finish de-coupling the uapi from kernel headers,
move generic-y of exported headers to uapi/asm/Kbuild.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/xtensa/include/asm/Kbuild | 9 ---------
arch/xtensa/include/uapi/asm/Kbuild | 10 ++++++++++
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild
index cc23e9ecc6bb..0b408dc2366e 100644
--- a/arch/xtensa/include/asm/Kbuild
+++ b/arch/xtensa/include/asm/Kbuild
@@ -1,20 +1,15 @@
-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 += linkage.h
generic-y += local.h
generic-y += local64.h
@@ -22,12 +17,8 @@ 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 += siginfo.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
diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild
index b15bf6bc0e94..a5bcdfb890f1 100644
--- a/arch/xtensa/include/uapi/asm/Kbuild
+++ b/arch/xtensa/include/uapi/asm/Kbuild
@@ -1,2 +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
[toc] | [prev] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-06-12 05:40 +0200 |
| Subject | [PATCH 10/27] h8300: move generic-y of exported headers to uapi/asm/Kbuild |
| Message-ID | <tRomT-5hX-27@gated-at.bofh.it> |
| In reply to | #1663223 |
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.
scripts/Makefile.headersinst still need to deal with old-kbuild-file
for headers listed in arch/*/include/asm/Kbuild, but actually exported.
As the last work to finish de-coupling the uapi from kernel headers,
move generic-y of exported headers to uapi/asm/Kbuild.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/h8300/include/asm/Kbuild | 27 ---------------------------
arch/h8300/include/uapi/asm/Kbuild | 28 ++++++++++++++++++++++++++++
2 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild
index 757cdeb24e6e..5f2af32a7a57 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,65 +10,39 @@ 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 += 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 += siginfo.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 += unaligned.h
generic-y += vga.h
generic-y += word-at-a-time.h
diff --git a/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild
index b15bf6bc0e94..187aed820e71 100644
--- a/arch/h8300/include/uapi/asm/Kbuild
+++ b/arch/h8300/include/uapi/asm/Kbuild
@@ -1,2 +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
[toc] | [prev] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-06-12 05:40 +0200 |
| Subject | [PATCH 09/27] cris: move generic-y of exported headers to uapi/asm/Kbuild |
| Message-ID | <tRomT-5hX-31@gated-at.bofh.it> |
| In reply to | #1663223 |
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.
scripts/Makefile.headersinst still need to deal with old-kbuild-file
for headers listed in arch/*/include/asm/Kbuild, but actually exported.
As the last work to finish de-coupling the uapi from kernel headers,
move generic-y of exported headers to uapi/asm/Kbuild.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/cris/include/asm/Kbuild | 18 ------------------
arch/cris/include/uapi/asm/Kbuild | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index 2890099992a9..5194aad168a3 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -1,48 +1,30 @@
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 += 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 += 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 += siginfo.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
diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild
index b15bf6bc0e94..3687b54bb18e 100644
--- a/arch/cris/include/uapi/asm/Kbuild
+++ b/arch/cris/include/uapi/asm/Kbuild
@@ -1,2 +1,21 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+
+generic-y += auxvec.h
+generic-y += bitsperlong.h
+generic-y += errno.h
+generic-y += fcntl.h
+generic-y += ioctl.h
+generic-y += ipcbuf.h
+generic-y += kvm_para.h
+generic-y += mman.h
+generic-y += msgbuf.h
+generic-y += poll.h
+generic-y += resource.h
+generic-y += sembuf.h
+generic-y += shmbuf.h
+generic-y += siginfo.h
+generic-y += socket.h
+generic-y += sockios.h
+generic-y += statfs.h
+generic-y += types.h
--
2.7.4
[toc] | [prev] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-06-12 05:40 +0200 |
| Subject | [PATCH 01/27] kbuild: remove useless $(gen) variable in Makefile.headersinst |
| Message-ID | <tRomT-5hX-33@gated-at.bofh.it> |
| In reply to | #1663223 |
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> --- scripts/Makefile.headersinst | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index ce753a408c56..c801bc129635 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -31,9 +31,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) @@ -45,7 +42,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
[toc] | [prev] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-06-12 05:40 +0200 |
| Subject | [PATCH 20/27] sh: move generic-y of exported headers to uapi/asm/Kbuild |
| Message-ID | <tRomT-5hX-35@gated-at.bofh.it> |
| In reply to | #1663223 |
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.
scripts/Makefile.headersinst still need to deal with old-kbuild-file
for headers listed in arch/*/include/asm/Kbuild, but actually exported.
As the last work to finish de-coupling the uapi from kernel headers,
move generic-y of exported headers to uapi/asm/Kbuild.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/sh/include/asm/Kbuild | 20 --------------------
arch/sh/include/uapi/asm/Kbuild | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/arch/sh/include/asm/Kbuild b/arch/sh/include/asm/Kbuild
index cf2a75063b53..1a6f9c39feef 100644
--- a/arch/sh/include/asm/Kbuild
+++ b/arch/sh/include/asm/Kbuild
@@ -1,40 +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 += siginfo.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 b15bf6bc0e94..e28531333efa 100644
--- a/arch/sh/include/uapi/asm/Kbuild
+++ b/arch/sh/include/uapi/asm/Kbuild
@@ -1,2 +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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web