All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 00/27] kbuild, arch: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst
@ 2017-06-12  3:26 ` Masahiro Yamada
  0 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:26 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Rich Felker, linux-ia64, linux-sh, Catalin Marinas, Will Deacon,
	James E.J. Bottomley, Masahiro Yamada, sparclinux, Guan Xuetao,
	Jonas Bonn, Jesper Nilsson, linux-c6x-dev, Yoshinori Sato,
	linux-hexagon, Helge Deller, Aurelien Jacquiot, Russell King,
	Geert Uytterhoeven, Mark Salter, linux-snps-arc,
	uclinux-h8-devel, Fenghua Yu, James Hogan, Chris Metcalf, Steven


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


^ permalink raw reply	[flat|nested] 49+ messages in thread

* [PATCH 00/27] kbuild, arch: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst
@ 2017-06-12  3:26 ` Masahiro Yamada
  0 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:26 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Rich Felker, linux-ia64, linux-sh, Catalin Marinas, Will Deacon,
	James E.J. Bottomley, Masahiro Yamada, sparclinux, Guan Xuetao,
	Jonas Bonn, Jesper Nilsson, linux-c6x-dev, Yoshinori Sato,
	linux-hexagon, Helge Deller, Aurelien Jacquiot, Russell King,
	Geert Uytterhoeven, Mark Salter, linux-snps-arc,
	uclinux-h8-devel, Fenghua Yu, James Hogan, Chris Metcalf, Steven


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

^ permalink raw reply	[flat|nested] 49+ messages in thread

* [PATCH 00/27] kbuild, arch: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst
@ 2017-06-12  3:26 ` Masahiro Yamada
  0 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:26 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, Ley Foon Tan, Tony Luck, linux-ia64, linux-sh,
	sparclinux, James Hogan, linux-parisc, Geert Uytterhoeven,
	Steven Miao, Chris Metcalf, Mikael Starvik, linux-c6x-dev,
	linux-hexagon, Catalin Marinas, Vineet Gupta, linux-metag,
	Yoshinori Sato, Jesper Nilsson, Will Deacon, Fenghua Yu,
	linux-snps-arc, Max Filippov, uclinux-h8-devel, linux-xtensa,
	Stefan Kristiansson, Michal Marek, Chris Zankel,
	adi-buildroot-devel, Rich Felker, linux-m68k, openrisc,
	Mark Salter, Guan Xuetao, nios2-dev, Stafford Horne,
	Russell King, Aurelien Jacquiot, Jonas Bonn, linux-arm-kernel,
	linux-cris-kernel, linux-kernel, David S. Miller,
	James E.J. Bottomley, Richard Kuo, Helge Deller


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

^ permalink raw reply	[flat|nested] 49+ messages in thread

* [PATCH 00/27] kbuild, arch: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst
@ 2017-06-12  3:26 ` Masahiro Yamada
  0 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:26 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, Ley Foon Tan, Tony Luck, linux-ia64, linux-sh,
	sparclinux, James Hogan, linux-parisc, Geert Uytterhoeven,
	Steven Miao, Chris Metcalf, Mikael Starvik, linux-c6x-dev,
	linux-hexagon, Catalin Marinas, Vineet Gupta, linux-metag,
	Yoshinori Sato, Jesper Nilsson, Will Deacon, Fenghua Yu,
	linux-snps-arc, Max Filippov, uclinux-h8-devel, linux-xtensa,
	Stefan Kristiansson, Michal Marek, Chris Zankel,
	adi-buildroot-devel, Rich Felker, linux-m68k, openrisc,
	Mark Salter, Guan Xuetao, nios2-dev, Stafford Horne,
	Russell King, Aurelien Jacquiot, Jonas Bonn, linux-arm-kernel,
	linux-cris-kernel, linux-kernel, David S. Miller,
	James E.J. Bottomley, Richard Kuo, Helge Deller


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


^ permalink raw reply	[flat|nested] 49+ messages in thread

* [PATCH 00/27] kbuild, arch: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst
@ 2017-06-12  3:26 ` Masahiro Yamada
  0 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:26 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Rich Felker, linux-ia64, linux-sh, Catalin Marinas, Will Deacon,
	James E.J. Bottomley, Masahiro Yamada, sparclinux, Guan Xuetao,
	Jonas Bonn, Jesper Nilsson, linux-c6x-dev, Yoshinori Sato,
	linux-hexagon, Helge Deller, Aurelien Jacquiot, Russell King,
	Geert Uytterhoeven, Mark Salter, linux-snps-arc,
	uclinux-h8-devel, Fenghua Yu, James Hogan, Chris Metcalf, Steven


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

^ permalink raw reply	[flat|nested] 49+ messages in thread

* [PATCH 00/27] kbuild, arch: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst
@ 2017-06-12  3:26 ` Masahiro Yamada
  0 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:26 UTC (permalink / raw)
  To: linux-snps-arc


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

^ permalink raw reply	[flat|nested] 49+ messages in thread

* [PATCH 00/27] kbuild, arch: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst
@ 2017-06-12  3:26 ` Masahiro Yamada
  0 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:26 UTC (permalink / raw)
  To: linux-arm-kernel


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

^ permalink raw reply	[flat|nested] 49+ messages in thread

* [PATCH 01/27] kbuild: remove useless $(gen) variable in Makefile.headersinst
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (5 preceding siblings ...)
  (?)
@ 2017-06-12  3:26 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:26 UTC (permalink / raw)
  To: linux-kbuild, linux-arch; +Cc: Masahiro Yamada, Michal Marek, 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>
---

 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

^ permalink raw reply related	[flat|nested] 49+ messages in thread

* [PATCH 02/27] kbuild: fix comment about dst of headers_{install,check}_all
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (6 preceding siblings ...)
  (?)
@ 2017-06-12  3:26 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:26 UTC (permalink / raw)
  To: linux-kbuild, linux-arch; +Cc: Masahiro Yamada, Michal Marek, 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 63e10bd4f14a..298a096863a9 100644
--- a/Makefile
+++ b/Makefile
@@ -1141,7 +1141,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] 49+ messages in thread

* [PATCH 03/27] kbuild: pass dst= to Makefile.headersinst from top Makefile
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (7 preceding siblings ...)
  (?)
@ 2017-06-12  3:26 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:26 UTC (permalink / raw)
  To: linux-kbuild, linux-arch; +Cc: Masahiro Yamada, Michal Marek, 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 ++--
 scripts/Makefile.headersinst | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 298a096863a9..1bb8c07db134 100644
--- a/Makefile
+++ b/Makefile
@@ -1162,7 +1162,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
@@ -1171,7 +1171,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
 
 # ---------------------------------------------------------------------------
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index c801bc129635..b3135b76fac2 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -15,15 +15,13 @@ include scripts/Kbuild.include
 
 srcdir        := $(srctree)/$(obj)
 subdirs       := $(patsubst $(srcdir)/%/.,%,$(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.
@@ -40,8 +38,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] 49+ messages in thread

* [PATCH 04/27] arm64: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
@ 2017-06-12  3:26   ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:26 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, Will Deacon, Catalin Marinas, linux-kernel,
	linux-arm-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.

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.

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

 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] 49+ messages in thread

* [PATCH 04/27] arm64: move generic-y of exported headers to uapi/asm/Kbuild
@ 2017-06-12  3:26   ` Masahiro Yamada
  0 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:26 UTC (permalink / raw)
  To: linux-arm-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.

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.

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

 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] 49+ messages in thread

* [PATCH 05/27] ARM: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
@ 2017-06-12  3:26   ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:26 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, Russell King, linux-arm-kernel, 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.

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/arm/include/asm/Kbuild      | 17 -----------------
 arch/arm/include/uapi/asm/Kbuild | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index 3a36d99ff836..721ab5ecfb9b 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -1,40 +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 += siginfo.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 607f702c2d62..b531c2786f27 100644
--- a/arch/arm/include/uapi/asm/Kbuild
+++ b/arch/arm/include/uapi/asm/Kbuild
@@ -1,6 +1,22 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
 
+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
+
 genhdr-y += unistd-common.h
 genhdr-y += unistd-oabi.h
 genhdr-y += unistd-eabi.h
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 49+ messages in thread

* [PATCH 05/27] ARM: move generic-y of exported headers to uapi/asm/Kbuild
@ 2017-06-12  3:26   ` Masahiro Yamada
  0 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:26 UTC (permalink / raw)
  To: linux-arm-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.

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/arm/include/asm/Kbuild      | 17 -----------------
 arch/arm/include/uapi/asm/Kbuild | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index 3a36d99ff836..721ab5ecfb9b 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -1,40 +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 += siginfo.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 607f702c2d62..b531c2786f27 100644
--- a/arch/arm/include/uapi/asm/Kbuild
+++ b/arch/arm/include/uapi/asm/Kbuild
@@ -1,6 +1,22 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
 
+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
+
 genhdr-y += unistd-common.h
 genhdr-y += unistd-oabi.h
 genhdr-y += unistd-eabi.h
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 49+ messages in thread

* [PATCH 06/27] arc: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
@ 2017-06-12  3:27   ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, linux-snps-arc, Vineet Gupta, 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.

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/arc/include/asm/Kbuild      | 25 -------------------------
 arch/arc/include/uapi/asm/Kbuild | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/arch/arc/include/asm/Kbuild b/arch/arc/include/asm/Kbuild
index 7bee4e4799fd..353dae386b2f 100644
--- a/arch/arc/include/asm/Kbuild
+++ b/arch/arc/include/asm/Kbuild
@@ -1,52 +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 += 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 += 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 b15bf6bc0e94..fa6d0ff4ff89 100644
--- a/arch/arc/include/uapi/asm/Kbuild
+++ b/arch/arc/include/uapi/asm/Kbuild
@@ -1,2 +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] 49+ messages in thread

* [PATCH 06/27] arc: move generic-y of exported headers to uapi/asm/Kbuild
@ 2017-06-12  3:27   ` Masahiro Yamada
  0 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-snps-arc

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 at socionext.com>
---

 arch/arc/include/asm/Kbuild      | 25 -------------------------
 arch/arc/include/uapi/asm/Kbuild | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/arch/arc/include/asm/Kbuild b/arch/arc/include/asm/Kbuild
index 7bee4e4799fd..353dae386b2f 100644
--- a/arch/arc/include/asm/Kbuild
+++ b/arch/arc/include/asm/Kbuild
@@ -1,52 +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 += 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 += 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 b15bf6bc0e94..fa6d0ff4ff89 100644
--- a/arch/arc/include/uapi/asm/Kbuild
+++ b/arch/arc/include/uapi/asm/Kbuild
@@ -1,2 +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] 49+ messages in thread

* [PATCH 07/27] blackfin: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (11 preceding siblings ...)
  (?)
@ 2017-06-12  3:27 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, Steven Miao, adi-buildroot-devel, 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.

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/blackfin/include/asm/Kbuild      | 22 ----------------------
 arch/blackfin/include/uapi/asm/Kbuild | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/arch/blackfin/include/asm/Kbuild b/arch/blackfin/include/asm/Kbuild
index dc4ef9ac1e83..080cac9d6704 100644
--- a/arch/blackfin/include/asm/Kbuild
+++ b/arch/blackfin/include/asm/Kbuild
@@ -1,48 +1,26 @@
-
-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 += 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
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] 49+ messages in thread

* [PATCH 08/27] c6x: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (12 preceding siblings ...)
  (?)
@ 2017-06-12  3:27 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, linux-kernel, Mark Salter, Aurelien Jacquiot,
	linux-c6x-dev

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/c6x/include/asm/Kbuild      | 27 ---------------------------
 arch/c6x/include/uapi/asm/Kbuild | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
index f0eaf0475e7e..7c971e182b35 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,17 +7,12 @@ 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
@@ -28,36 +20,17 @@ generic-y += kmap_types.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 += 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 += 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
diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild
index 13a97aa2285f..67ee896a76a7 100644
--- a/arch/c6x/include/uapi/asm/Kbuild
+++ b/arch/c6x/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 += 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] 49+ messages in thread

* [PATCH 09/27] cris: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (13 preceding siblings ...)
  (?)
@ 2017-06-12  3:27 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, Mikael Starvik, linux-cris-kernel,
	Jesper Nilsson, 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.

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

^ permalink raw reply related	[flat|nested] 49+ messages in thread

* [PATCH 10/27] h8300: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (14 preceding siblings ...)
  (?)
@ 2017-06-12  3:27 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, Yoshinori Sato, uclinux-h8-devel, 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.

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

^ permalink raw reply related	[flat|nested] 49+ messages in thread

* [PATCH 11/27] hexagon: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (15 preceding siblings ...)
  (?)
@ 2017-06-12  3:27 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, Richard Kuo, linux-kernel, linux-hexagon

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/hexagon/include/asm/Kbuild      | 23 -----------------------
 arch/hexagon/include/uapi/asm/Kbuild | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild
index 6b45ef79eb8f..28d1fe16278e 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,17 +6,12 @@ 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
@@ -26,33 +20,16 @@ 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 += siginfo.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
diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild
index b15bf6bc0e94..cb5df3aad3a8 100644
--- a/arch/hexagon/include/uapi/asm/Kbuild
+++ b/arch/hexagon/include/uapi/asm/Kbuild
@@ -1,2 +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] 49+ messages in thread

* [PATCH 12/27] ia64: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
@ 2017-06-12  3:27   ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, Tony Luck, linux-ia64, Fenghua Yu, 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] 49+ messages in thread

* [PATCH 12/27] ia64: move generic-y of exported headers to uapi/asm/Kbuild
@ 2017-06-12  3:27   ` Masahiro Yamada
  0 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, Tony Luck, linux-ia64, Fenghua Yu, 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] 49+ messages in thread

* [PATCH 13/27] m32r: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (17 preceding siblings ...)
  (?)
@ 2017-06-12  3:27 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch; +Cc: 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.

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/m32r/include/asm/Kbuild      | 2 --
 arch/m32r/include/uapi/asm/Kbuild | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild
index c000ffac8586..15ad847321fc 100644
--- a/arch/m32r/include/asm/Kbuild
+++ b/arch/m32r/include/asm/Kbuild
@@ -1,10 +1,8 @@
-
 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 += mcs_spinlock.h
 generic-y += mm-arch-hooks.h
 generic-y += module.h
diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild
index b15bf6bc0e94..13a97aa2285f 100644
--- a/arch/m32r/include/uapi/asm/Kbuild
+++ b/arch/m32r/include/uapi/asm/Kbuild
@@ -1,2 +1,4 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
+
+generic-y += kvm_para.h
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 49+ messages in thread

* [PATCH 14/27] m68k: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
@ 2017-06-12  3:27   ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, Geert Uytterhoeven, linux-m68k, 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.

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.

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.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/m68k/include/asm/Kbuild      | 12 ------------
 arch/m68k/include/uapi/asm/Kbuild | 11 +++++++++++
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 82005d2ff717..2e547df53344 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -1,37 +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 += 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 += siginfo.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 64368077235a..3717b64a620d 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -2,10 +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] 49+ messages in thread

* [PATCH 14/27] m68k: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (18 preceding siblings ...)
  (?)
@ 2017-06-12  3:27 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, Geert Uytterhoeven, linux-m68k, 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.

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.

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.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/m68k/include/asm/Kbuild      | 12 ------------
 arch/m68k/include/uapi/asm/Kbuild | 11 +++++++++++
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 82005d2ff717..2e547df53344 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -1,37 +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 += 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 += siginfo.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 64368077235a..3717b64a620d 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -2,10 +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] 49+ messages in thread

* [PATCH 14/27] m68k: move generic-y of exported headers to uapi/asm/Kbuild
@ 2017-06-12  3:27   ` Masahiro Yamada
  0 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, Geert Uytterhoeven, linux-m68k, 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.

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.

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.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/m68k/include/asm/Kbuild      | 12 ------------
 arch/m68k/include/uapi/asm/Kbuild | 11 +++++++++++
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 82005d2ff717..2e547df53344 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -1,37 +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 += 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 += siginfo.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 64368077235a..3717b64a620d 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -2,10 +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] 49+ messages in thread

* [PATCH 15/27] metag: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (20 preceding siblings ...)
  (?)
@ 2017-06-12  3:27 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, James Hogan, linux-metag, 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.

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/metag/include/asm/Kbuild      | 24 ------------------------
 arch/metag/include/uapi/asm/Kbuild | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/arch/metag/include/asm/Kbuild b/arch/metag/include/asm/Kbuild
index 8f940553a579..cd06d246d06c 100644
--- a/arch/metag/include/asm/Kbuild
+++ b/arch/metag/include/asm/Kbuild
@@ -1,55 +1,31 @@
-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 += 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
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] 49+ messages in thread

* [PATCH 16/27] nios2: remove unneeded arch/nios2/include/(generated/)asm/signal.h
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (21 preceding siblings ...)
  (?)
@ 2017-06-12  3:27 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, Ley Foon Tan, linux-kernel, nios2-dev

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 727dbb333f60..fcef68198465 100644
--- a/arch/nios2/include/asm/Kbuild
+++ b/arch/nios2/include/asm/Kbuild
@@ -48,7 +48,6 @@ generic-y += sembuf.h
 generic-y += serial.h
 generic-y += shmbuf.h
 generic-y += siginfo.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] 49+ messages in thread

* [PATCH 17/27] nios2: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (22 preceding siblings ...)
  (?)
@ 2017-06-12  3:27 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, Ley Foon Tan, linux-kernel, nios2-dev

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/nios2/include/asm/Kbuild      | 24 ------------------------
 arch/nios2/include/uapi/asm/Kbuild | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/arch/nios2/include/asm/Kbuild b/arch/nios2/include/asm/Kbuild
index fcef68198465..7010251c0545 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,52 +10,30 @@ 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 += 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 += siginfo.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
diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild
index 374bd123329f..ffca24da7647 100644
--- a/arch/nios2/include/uapi/asm/Kbuild
+++ b/arch/nios2/include/uapi/asm/Kbuild
@@ -1,5 +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] 49+ messages in thread

* [PATCH 18/27] openrisc: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
@ 2017-06-12  3:27   ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, openrisc, Stafford Horne, Jonas Bonn,
	Stefan Kristiansson, 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.

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/openrisc/include/asm/Kbuild      | 28 ----------------------------
 arch/openrisc/include/uapi/asm/Kbuild | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild
index fdbcf0bf44a4..5e209fcd9a54 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,56 +9,30 @@ 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 += 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 += siginfo.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
diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild
index b15bf6bc0e94..62286dbeb904 100644
--- a/arch/openrisc/include/uapi/asm/Kbuild
+++ b/arch/openrisc/include/uapi/asm/Kbuild
@@ -1,2 +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] 49+ messages in thread

* [OpenRISC] [PATCH 18/27] openrisc: move generic-y of exported headers to uapi/asm/Kbuild
@ 2017-06-12  3:27   ` Masahiro Yamada
  0 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: openrisc

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/openrisc/include/asm/Kbuild      | 28 ----------------------------
 arch/openrisc/include/uapi/asm/Kbuild | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild
index fdbcf0bf44a4..5e209fcd9a54 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,56 +9,30 @@ 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 += 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 += siginfo.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
diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild
index b15bf6bc0e94..62286dbeb904 100644
--- a/arch/openrisc/include/uapi/asm/Kbuild
+++ b/arch/openrisc/include/uapi/asm/Kbuild
@@ -1,2 +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] 49+ messages in thread

* [PATCH 19/27] parisc: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (24 preceding siblings ...)
  (?)
@ 2017-06-12  3:27 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, James E.J. Bottomley, Helge Deller,
	linux-kernel, linux-parisc

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/parisc/include/asm/Kbuild      | 5 -----
 arch/parisc/include/uapi/asm/Kbuild | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
index a9909c2d04c5..e26348d52ecc 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,11 @@ 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 += 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
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] 49+ messages in thread

* [PATCH 20/27] sh: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
@ 2017-06-12  3:27   ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, Yoshinori Sato, Rich Felker, linux-kernel, linux-sh

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


^ permalink raw reply related	[flat|nested] 49+ messages in thread

* [PATCH 20/27] sh: move generic-y of exported headers to uapi/asm/Kbuild
@ 2017-06-12  3:27   ` Masahiro Yamada
  0 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, Yoshinori Sato, Rich Felker, linux-kernel, linux-sh

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

^ permalink raw reply related	[flat|nested] 49+ messages in thread

* [PATCH 21/27] sparc: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
@ 2017-06-12  3:27   ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, sparclinux, linux-kernel, David S. Miller

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/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] 49+ messages in thread

* [PATCH 21/27] sparc: move generic-y of exported headers to uapi/asm/Kbuild
@ 2017-06-12  3:27   ` Masahiro Yamada
  0 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, sparclinux, linux-kernel, David S. Miller

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/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] 49+ messages in thread

* [PATCH 22/27] tile: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (27 preceding siblings ...)
  (?)
@ 2017-06-12  3:27 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch; +Cc: Masahiro Yamada, Chris Metcalf, 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.

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/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] 49+ messages in thread

* [PATCH 23/27] unicore32: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (28 preceding siblings ...)
  (?)
@ 2017-06-12  3:27 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch; +Cc: Masahiro Yamada, linux-kernel, Guan Xuetao

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.

I moved "generic-y += kprobes.h" to keep the entries sorted.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/unicore32/include/asm/Kbuild      | 31 +------------------------------
 arch/unicore32/include/uapi/asm/Kbuild | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild
index e9ad511c1043..fda7e2153086 100644
--- a/arch/unicore32/include/asm/Kbuild
+++ b/arch/unicore32/include/asm/Kbuild
@@ -1,67 +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 += siginfo.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 13a97aa2285f..759a71411169 100644
--- a/arch/unicore32/include/uapi/asm/Kbuild
+++ b/arch/unicore32/include/uapi/asm/Kbuild
@@ -1,4 +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] 49+ messages in thread

* [PATCH 24/27] xtensa: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (29 preceding siblings ...)
  (?)
@ 2017-06-12  3:27 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch
  Cc: Masahiro Yamada, linux-xtensa, Chris Zankel, linux-kernel, Max Filippov

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

^ permalink raw reply related	[flat|nested] 49+ messages in thread

* [PATCH 25/27] kbuild: do not include old-kbuild-file from Makefile.headersinst
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (30 preceding siblings ...)
  (?)
@ 2017-06-12  3:27 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch; +Cc: Masahiro Yamada, Michal Marek, 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>
---

 scripts/Makefile.headersinst | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index b3135b76fac2..d6be5e482636 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -33,11 +33,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] 49+ messages in thread

* [PATCH 26/27] kbuild: split exported generic header creation into uapi-asm-generic
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (31 preceding siblings ...)
  (?)
@ 2017-06-12  3:27 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch; +Cc: Masahiro Yamada, Michal Marek, 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 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

^ permalink raw reply related	[flat|nested] 49+ messages in thread

* [PATCH 27/27] kbuild: remove wrapper files handling from Makefile.headersinst
  2017-06-12  3:26 ` Masahiro Yamada
                   ` (32 preceding siblings ...)
  (?)
@ 2017-06-12  3:27 ` Masahiro Yamada
  -1 siblings, 0 replies; 49+ messages in thread
From: Masahiro Yamada @ 2017-06-12  3:27 UTC (permalink / raw)
  To: linux-kbuild, linux-arch; +Cc: Masahiro Yamada, Michal Marek, 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>
---

 scripts/Makefile.headersinst | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index d6be5e482636..5a3da7c42c09 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -45,14 +45,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),)
@@ -76,9 +70,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] 49+ messages in thread

* Re: [PATCH 04/27] arm64: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:26   ` Masahiro Yamada
@ 2017-06-12 12:09     ` Catalin Marinas
  -1 siblings, 0 replies; 49+ messages in thread
From: Catalin Marinas @ 2017-06-12 12:09 UTC (permalink / raw)
  To: Masahiro Yamada
  Cc: linux-kbuild, linux-arch, Will Deacon, linux-kernel, linux-arm-kernel

On Mon, Jun 12, 2017 at 12:26:58PM +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.
> 
> 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.
> 
> 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>
> ---
> 
>  arch/arm64/include/asm/Kbuild      | 17 -----------------
>  arch/arm64/include/uapi/asm/Kbuild | 16 ++++++++++++++++
>  2 files changed, 16 insertions(+), 17 deletions(-)

Acked-by: Catalin Marinas <catalin.marinas@arm.com>

^ permalink raw reply	[flat|nested] 49+ messages in thread

* [PATCH 04/27] arm64: move generic-y of exported headers to uapi/asm/Kbuild
@ 2017-06-12 12:09     ` Catalin Marinas
  0 siblings, 0 replies; 49+ messages in thread
From: Catalin Marinas @ 2017-06-12 12:09 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Jun 12, 2017 at 12:26:58PM +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.
> 
> 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.
> 
> 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>
> ---
> 
>  arch/arm64/include/asm/Kbuild      | 17 -----------------
>  arch/arm64/include/uapi/asm/Kbuild | 16 ++++++++++++++++
>  2 files changed, 16 insertions(+), 17 deletions(-)

Acked-by: Catalin Marinas <catalin.marinas@arm.com>

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: [PATCH 14/27] m68k: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:27   ` Masahiro Yamada
  (?)
@ 2017-06-12 12:10     ` Geert Uytterhoeven
  -1 siblings, 0 replies; 49+ messages in thread
From: Geert Uytterhoeven @ 2017-06-12 12:10 UTC (permalink / raw)
  To: Masahiro Yamada; +Cc: linux-kbuild, linux-arch, linux-m68k, linux-kernel

On Mon, Jun 12, 2017 at 5:27 AM, 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.
>
> 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.
>
> 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.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: [PATCH 14/27] m68k: move generic-y of exported headers to uapi/asm/Kbuild
  2017-06-12  3:27   ` Masahiro Yamada
  (?)
  (?)
@ 2017-06-12 12:10   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 49+ messages in thread
From: Geert Uytterhoeven @ 2017-06-12 12:10 UTC (permalink / raw)
  To: Masahiro Yamada; +Cc: linux-kbuild, linux-arch, linux-m68k, linux-kernel

On Mon, Jun 12, 2017 at 5:27 AM, 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.
>
> 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.
>
> 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.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: [PATCH 14/27] m68k: move generic-y of exported headers to uapi/asm/Kbuild
@ 2017-06-12 12:10     ` Geert Uytterhoeven
  0 siblings, 0 replies; 49+ messages in thread
From: Geert Uytterhoeven @ 2017-06-12 12:10 UTC (permalink / raw)
  To: Masahiro Yamada; +Cc: linux-kbuild, linux-arch, linux-m68k, linux-kernel

On Mon, Jun 12, 2017 at 5:27 AM, 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.
>
> 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.
>
> 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.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 49+ messages in thread

* Re: [PATCH 14/27] m68k: move generic-y of exported headers to uapi/asm/Kbuild
@ 2017-06-12 12:10     ` Geert Uytterhoeven
  0 siblings, 0 replies; 49+ messages in thread
From: Geert Uytterhoeven @ 2017-06-12 12:10 UTC (permalink / raw)
  To: Masahiro Yamada; +Cc: linux-kbuild, linux-arch, linux-m68k, linux-kernel

On Mon, Jun 12, 2017 at 5:27 AM, 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.
>
> 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.
>
> 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.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Gr{oetje,eeting}s,

                        Geert

^ permalink raw reply	[flat|nested] 49+ messages in thread

end of thread, other threads:[~2017-06-12 12:10 UTC | newest]

Thread overview: 49+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-12  3:26 [PATCH 00/27] kbuild, arch: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
2017-06-12  3:26 ` Masahiro Yamada
2017-06-12  3:26 ` Masahiro Yamada
2017-06-12  3:26 ` Masahiro Yamada
2017-06-12  3:26 ` Masahiro Yamada
2017-06-12  3:26 ` Masahiro Yamada
2017-06-12  3:26 ` Masahiro Yamada
2017-06-12  3:26 ` [PATCH 01/27] kbuild: remove useless $(gen) variable in Makefile.headersinst Masahiro Yamada
2017-06-12  3:26 ` [PATCH 02/27] kbuild: fix comment about dst of headers_{install,check}_all Masahiro Yamada
2017-06-12  3:26 ` [PATCH 03/27] kbuild: pass dst= to Makefile.headersinst from top Makefile Masahiro Yamada
2017-06-12  3:26 ` [PATCH 04/27] arm64: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada
2017-06-12  3:26   ` Masahiro Yamada
2017-06-12 12:09   ` Catalin Marinas
2017-06-12 12:09     ` Catalin Marinas
2017-06-12  3:26 ` [PATCH 05/27] ARM: " Masahiro Yamada
2017-06-12  3:26   ` Masahiro Yamada
2017-06-12  3:27 ` [PATCH 06/27] arc: " Masahiro Yamada
2017-06-12  3:27   ` Masahiro Yamada
2017-06-12  3:27 ` [PATCH 07/27] blackfin: " Masahiro Yamada
2017-06-12  3:27 ` [PATCH 08/27] c6x: " Masahiro Yamada
2017-06-12  3:27 ` [PATCH 09/27] cris: " Masahiro Yamada
2017-06-12  3:27 ` [PATCH 10/27] h8300: " Masahiro Yamada
2017-06-12  3:27 ` [PATCH 11/27] hexagon: " Masahiro Yamada
2017-06-12  3:27 ` [PATCH 12/27] ia64: " Masahiro Yamada
2017-06-12  3:27   ` Masahiro Yamada
2017-06-12  3:27 ` [PATCH 13/27] m32r: " Masahiro Yamada
2017-06-12  3:27 ` [PATCH 14/27] m68k: " Masahiro Yamada
2017-06-12  3:27 ` Masahiro Yamada
2017-06-12  3:27   ` Masahiro Yamada
2017-06-12 12:10   ` Geert Uytterhoeven
2017-06-12 12:10     ` Geert Uytterhoeven
2017-06-12 12:10     ` Geert Uytterhoeven
2017-06-12 12:10   ` Geert Uytterhoeven
2017-06-12  3:27 ` [PATCH 15/27] metag: " Masahiro Yamada
2017-06-12  3:27 ` [PATCH 16/27] nios2: remove unneeded arch/nios2/include/(generated/)asm/signal.h Masahiro Yamada
2017-06-12  3:27 ` [PATCH 17/27] nios2: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada
2017-06-12  3:27 ` [PATCH 18/27] openrisc: " Masahiro Yamada
2017-06-12  3:27   ` [OpenRISC] " Masahiro Yamada
2017-06-12  3:27 ` [PATCH 19/27] parisc: " Masahiro Yamada
2017-06-12  3:27 ` [PATCH 20/27] sh: " Masahiro Yamada
2017-06-12  3:27   ` Masahiro Yamada
2017-06-12  3:27 ` [PATCH 21/27] sparc: " Masahiro Yamada
2017-06-12  3:27   ` Masahiro Yamada
2017-06-12  3:27 ` [PATCH 22/27] tile: " Masahiro Yamada
2017-06-12  3:27 ` [PATCH 23/27] unicore32: " Masahiro Yamada
2017-06-12  3:27 ` [PATCH 24/27] xtensa: " Masahiro Yamada
2017-06-12  3:27 ` [PATCH 25/27] kbuild: do not include old-kbuild-file from Makefile.headersinst Masahiro Yamada
2017-06-12  3:27 ` [PATCH 26/27] kbuild: split exported generic header creation into uapi-asm-generic Masahiro Yamada
2017-06-12  3:27 ` [PATCH 27/27] kbuild: remove wrapper files handling from Makefile.headersinst Masahiro Yamada

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.