While working one another patch-set I noticed some stray Kbuild files.
And then when I started to dig into this it somehow got out
of control and I ended up with the following set of patches.
Almost 600 lines chopped of the kernel - which is nice.
But even better is that the Kbuild files for uapi + asm-generic
has become simpler to grok after the clean-up.
The patch-set contains the following major items:
o Fix headers_install for cris - this was trivial to fix
after uapi support was added.
o Drop a few unused Kbuild files.
o Drop obsolete support for non uapi files in Makefile.headersinst
o Perform a long overdue clean-up of the uapi files.
The files contained a lot of redundant assignments.
o The last patch introduces include/asm-generic/Kbuild.generic
This file shall list all asm-generic files that are used by all architectures.
This makes it much simpler to add a new common asm-generic file.
The patch was broken up in many smaller peices as I wanted to keep the clean-up
patches separate for each architecture to make it easier for arch maintainers to
review/ack their part.
The clean-up patches rely on one of the former patches so they shall
be applied as one serie.
It was done on top of -rc4.
What tree is the best for this stuff?
I would suggest to go via the asm-generic tree that Arnd has.
But it also touches a lot of architectures so Andrews -mm or
kbuild#misc could be used.
The patch-set touches all architectues so I could not copy
all arch maintainers on the mail. Thus I rely on them to read linux-arch.
Sam
Sam Ravnborg (38):
cris: fix headers_install
openrisc: drop ucontext from list exported headers
hexagon: drop ucontext from list exported headers
score: drop irrelevant assignment from Kbuild file
tile: clean up Kbuild files
x86: clean-up Kbuild file - drop unused assignments
Delete unused Kbuild files in include/*
kbuild: drop support for non uapi Kbuild files in headers_install
uapi: check for optional files which are generated
uapi: drop obsolete logic for generated headers
alpha: clean-up uapi Kbuild file
arm: clean-up uapi Kbuild file
arm64: clean-up uapi Kbuild file
avr32: clean-up uapi Kbuild file
blackfin: clean-up uapi Kbuild file
c6x: clean-up uapi Kbuild file
cris: clean-up uapi Kbuild file
frv: clean-up uapi Kbuild file
hexagon: clean-up uapi Kbuild file
ia64: clean-up uapi Kbuild file
m32r: clean-up uapi Kbuild file
m68k: clean-up uapi Kbuild file
metag: clean-up uapi Kbuild file
microblaze: clean-up uapi Kbuild file
mips: clean-up uapi Kbuild file
mn10300: clean-up uapi Kbuild file
openrisc: clean-up uapi Kbuild file
parisc: clean-up uapi Kbuild file
powerpc: clean-up uapi Kbuild file
s390: clean-up uapi Kbuild file
score: clean-up uapi Kbuild file
sh: clean-up uapi Kbuild file
sparc: clean-up uapi Kbuild file
tile: clean-up uapi Kbuild file
unicore32: clean-up uapi Kbuild file
x86: clean-up uapi Kbuild file
xtensa: clean-up uapi Kbuild file
asm-generic: introduc Kbuild.generic
Documentation/kbuild/makefiles.txt | 4 ++--
arch/alpha/include/asm/Kbuild | 4 ++--
arch/alpha/include/uapi/asm/Kbuild | 32 ---------------------------
arch/arc/include/asm/Kbuild | 4 +++-
arch/arm/include/asm/Kbuild | 4 ++--
arch/arm/include/uapi/asm/Kbuild | 14 ------------
arch/arm64/include/asm/Kbuild | 4 ++--
arch/arm64/include/uapi/asm/Kbuild | 16 --------------
arch/avr32/include/asm/Kbuild | 3 ++-
arch/avr32/include/uapi/asm/Kbuild | 21 ++----------------
arch/blackfin/include/asm/Kbuild | 3 ++-
arch/blackfin/include/uapi/asm/Kbuild | 13 -----------
arch/c6x/include/asm/Kbuild | 3 ++-
arch/c6x/include/uapi/asm/Kbuild | 10 ---------
arch/cris/include/asm/Kbuild | 7 ++----
arch/cris/include/uapi/asm/Kbuild | 35 +++---------------------------
arch/frv/include/asm/Kbuild | 3 ++-
arch/frv/include/uapi/asm/Kbuild | 31 ---------------------------
arch/hexagon/include/asm/Kbuild | 5 ++---
arch/hexagon/include/uapi/asm/Kbuild | 10 ---------
arch/ia64/include/asm/Kbuild | 3 ++-
arch/ia64/include/uapi/asm/Kbuild | 36 +++----------------------------
arch/m32r/include/asm/Kbuild | 3 ++-
arch/m32r/include/uapi/asm/Kbuild | 31 ---------------------------
arch/m68k/include/asm/Kbuild | 4 +++-
arch/m68k/include/uapi/asm/Kbuild | 33 +++++++++-------------------
arch/metag/include/asm/Kbuild | 4 +++-
arch/metag/include/uapi/asm/Kbuild | 7 +-----
arch/microblaze/include/asm/Kbuild | 3 ++-
arch/microblaze/include/uapi/asm/Kbuild | 34 +++--------------------------
arch/mips/include/asm/Kbuild | 5 +++--
arch/mips/include/uapi/asm/Kbuild | 38 ++++++---------------------------
arch/mn10300/include/asm/Kbuild | 3 ++-
arch/mn10300/include/uapi/asm/Kbuild | 32 ---------------------------
arch/openrisc/include/asm/Kbuild | 5 ++---
arch/openrisc/include/uapi/asm/Kbuild | 6 ------
arch/parisc/include/asm/Kbuild | 3 ++-
arch/parisc/include/uapi/asm/Kbuild | 30 +++-----------------------
arch/powerpc/include/asm/Kbuild | 3 ++-
arch/powerpc/include/uapi/asm/Kbuild | 32 ---------------------------
arch/s390/include/asm/Kbuild | 4 ++--
arch/s390/include/uapi/asm/Kbuild | 31 ---------------------------
arch/score/include/asm/Kbuild | 6 ++----
arch/score/include/uapi/asm/Kbuild | 32 ---------------------------
arch/sh/include/asm/Kbuild | 3 ++-
arch/sh/include/uapi/asm/Kbuild | 12 -----------
arch/sparc/include/asm/Kbuild | 5 ++---
arch/sparc/include/uapi/asm/Kbuild | 30 --------------------------
arch/tile/include/arch/Kbuild | 1 -
arch/tile/include/asm/Kbuild | 5 ++---
arch/tile/include/uapi/asm/Kbuild | 14 +-----------
arch/um/include/asm/Kbuild | 4 +++-
arch/unicore32/include/asm/Kbuild | 3 ++-
arch/unicore32/include/uapi/asm/Kbuild | 7 +-----
arch/x86/include/asm/Kbuild | 8 ++-----
arch/x86/include/uapi/asm/Kbuild | 34 +----------------------------
arch/xtensa/include/asm/Kbuild | 4 +++-
arch/xtensa/include/uapi/asm/Kbuild | 23 --------------------
include/Kbuild | 2 --
include/asm-generic/Kbuild.generic | 6 ++++++
include/scsi/fc/Kbuild | 0
include/uapi/asm-generic/Kbuild.asm | 2 +-
include/video/Kbuild | 0
scripts/Makefile.headersinst | 22 ++-----------------
scripts/headers.sh | 2 --
65 files changed, 109 insertions(+), 692 deletions(-)
Fix headers_install by adjusting the path to arch files.
And delete unused Kbuild file.
Drop special handling of cris in the headers.sh script as a nice side-effect.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Mikael Starvik <[email protected]>
Cc: Jesper Nilsson <[email protected]>
Cc: David Howells <[email protected]>
---
arch/cris/include/asm/Kbuild | 5 -----
arch/cris/include/uapi/asm/Kbuild | 4 ++--
scripts/headers.sh | 2 --
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index afff510..35574f5 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -1,8 +1,3 @@
-
-header-y += arch-v10/
-header-y += arch-v32/
-
-
generic-y += barrier.h
generic-y += clkdev.h
generic-y += cputime.h
diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild
index 7d47b36..01f66b8 100644
--- a/arch/cris/include/uapi/asm/Kbuild
+++ b/arch/cris/include/uapi/asm/Kbuild
@@ -1,8 +1,8 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-header-y += arch-v10/
-header-y += arch-v32/
+header-y += ../arch-v10/arch/
+header-y += ../arch-v32/arch/
header-y += auxvec.h
header-y += bitsperlong.h
header-y += byteorder.h
diff --git a/scripts/headers.sh b/scripts/headers.sh
index 95ece06..d4dc4de 100755
--- a/scripts/headers.sh
+++ b/scripts/headers.sh
@@ -19,8 +19,6 @@ for arch in ${archs}; do
case ${arch} in
um) # no userspace export
;;
- cris) # headers export are known broken
- ;;
*)
if [ -d ${srctree}/arch/${arch} ]; then
do_command $1 ${arch}
--
1.9.3
ucontext.h is already specified in include/uapi/asm-generic/Kbuild
so this is redundant.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Jonas Bonn <[email protected]>
Cc: openrisc <[email protected]>
Cc: David Howells <[email protected]>
---
arch/openrisc/include/asm/Kbuild | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild
index 480af0d..4a80261 100644
--- a/arch/openrisc/include/asm/Kbuild
+++ b/arch/openrisc/include/asm/Kbuild
@@ -1,6 +1,3 @@
-
-header-y += ucontext.h
-
generic-y += atomic.h
generic-y += auxvec.h
generic-y += barrier.h
--
1.9.3
The following files are not used - and they serve no purpose.
Delete them.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: David Howells <[email protected]>
---
include/Kbuild | 2 --
include/scsi/fc/Kbuild | 0
include/video/Kbuild | 0
3 files changed, 2 deletions(-)
delete mode 100644 include/Kbuild
delete mode 100644 include/scsi/fc/Kbuild
delete mode 100644 include/video/Kbuild
diff --git a/include/Kbuild b/include/Kbuild
deleted file mode 100644
index bab1145..0000000
--- a/include/Kbuild
+++ /dev/null
@@ -1,2 +0,0 @@
-# Top-level Makefile calls into asm-$(ARCH)
-# List only non-arch directories below
diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/video/Kbuild b/include/video/Kbuild
deleted file mode 100644
index e69de29..0000000
--
1.9.3
Remove redundant assignments.
Also drop kvm_para.h wrapper as it is never referenced from c6x code.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Mark Salter <[email protected]>
Cc: Aurelien Jacquiot <[email protected]>
---
arch/c6x/include/uapi/asm/Kbuild | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild
index e9bc2b2..b15bf6b 100644
--- a/arch/c6x/include/uapi/asm/Kbuild
+++ b/arch/c6x/include/uapi/asm/Kbuild
@@ -1,12 +1,2 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-
-generic-y += kvm_para.h
-
-header-y += byteorder.h
-header-y += kvm_para.h
-header-y += ptrace.h
-header-y += setup.h
-header-y += sigcontext.h
-header-y += swab.h
-header-y += unistd.h
--
1.9.3
In include/uapi/asm-generic/Kbuild.asm we have a few optional files
listed. The files may be provided by the architecture
or the wrapped from asm-generic may be used.
The current logic failed to check for generated wrappers.
Replace the obsolete check for the file outside uapi with a check
for a generated file.
This changes makes a few "header-y += kvm_para.h" asssignments redundant.
Signed-off-by: Sam Ravnborg <[email protected]>
---
include/uapi/asm-generic/Kbuild.asm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm
index fcd50b7..81b3f40 100644
--- a/include/uapi/asm-generic/Kbuild.asm
+++ b/include/uapi/asm-generic/Kbuild.asm
@@ -43,7 +43,7 @@ header-y += $(foreach hdr,$(opt-header), \
$(if \
$(wildcard \
$(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \
- $(srctree)/arch/$(SRCARCH)/include/asm/$(hdr) \
+ $(objtree)/arch/$(SRCARCH)/include/generated/uapi/asm/$(hdr) \
), \
$(hdr) \
))
--
1.9.3
Kbuild.generic is for asm-generic files that are used
by all architectures.
So rather than adding the file to the individual Kbuild files
it is enough to add it to this file
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Arnd Bergmann <[email protected]>
---
arch/alpha/include/asm/Kbuild | 4 ++--
arch/arc/include/asm/Kbuild | 4 +++-
arch/arm/include/asm/Kbuild | 4 ++--
arch/arm64/include/asm/Kbuild | 4 ++--
arch/avr32/include/asm/Kbuild | 3 ++-
arch/blackfin/include/asm/Kbuild | 3 ++-
arch/c6x/include/asm/Kbuild | 3 ++-
arch/cris/include/asm/Kbuild | 4 +++-
arch/frv/include/asm/Kbuild | 3 ++-
arch/hexagon/include/asm/Kbuild | 4 +++-
arch/ia64/include/asm/Kbuild | 3 ++-
arch/m32r/include/asm/Kbuild | 3 ++-
arch/m68k/include/asm/Kbuild | 4 +++-
arch/metag/include/asm/Kbuild | 4 +++-
arch/microblaze/include/asm/Kbuild | 3 ++-
arch/mips/include/asm/Kbuild | 5 +++--
arch/mn10300/include/asm/Kbuild | 3 ++-
arch/openrisc/include/asm/Kbuild | 4 +++-
arch/parisc/include/asm/Kbuild | 3 ++-
arch/powerpc/include/asm/Kbuild | 3 ++-
arch/s390/include/asm/Kbuild | 4 ++--
arch/score/include/asm/Kbuild | 3 ++-
arch/sh/include/asm/Kbuild | 3 ++-
arch/sparc/include/asm/Kbuild | 5 ++---
arch/tile/include/asm/Kbuild | 4 +++-
arch/um/include/asm/Kbuild | 4 +++-
arch/unicore32/include/asm/Kbuild | 3 ++-
arch/x86/include/asm/Kbuild | 4 +++-
arch/xtensa/include/asm/Kbuild | 4 +++-
include/asm-generic/Kbuild.generic | 6 ++++++
30 files changed, 75 insertions(+), 36 deletions(-)
create mode 100644 include/asm-generic/Kbuild.generic
diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
index 96e54be..e09f8e7 100644
--- a/arch/alpha/include/asm/Kbuild
+++ b/arch/alpha/include/asm/Kbuild
@@ -1,9 +1,9 @@
-
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
generic-y += clkdev.h
generic-y += cputime.h
generic-y += exec.h
generic-y += hash.h
-generic-y += mcs_spinlock.h
generic-y += preempt.h
generic-y += trace_clock.h
diff --git a/arch/arc/include/asm/Kbuild b/arch/arc/include/asm/Kbuild
index e76fd79..dbbec4e 100644
--- a/arch/arc/include/asm/Kbuild
+++ b/arch/arc/include/asm/Kbuild
@@ -1,3 +1,6 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
+
generic-y += auxvec.h
generic-y += barrier.h
generic-y += bitsperlong.h
@@ -22,7 +25,6 @@ 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 += mman.h
generic-y += msgbuf.h
generic-y += param.h
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index f5a3576..a4c11de 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -1,4 +1,5 @@
-
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
generic-y += auxvec.h
generic-y += bitsperlong.h
@@ -14,7 +15,6 @@ generic-y += irq_regs.h
generic-y += kdebug.h
generic-y += local.h
generic-y += local64.h
-generic-y += mcs_spinlock.h
generic-y += msgbuf.h
generic-y += param.h
generic-y += parport.h
diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
index 0b3fcf8..af90fa1 100644
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@ -1,4 +1,5 @@
-
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
generic-y += bug.h
generic-y += bugs.h
@@ -24,7 +25,6 @@ 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 += mman.h
generic-y += msgbuf.h
generic-y += mutex.h
diff --git a/arch/avr32/include/asm/Kbuild b/arch/avr32/include/asm/Kbuild
index 00a0f3c..11b0832 100644
--- a/arch/avr32/include/asm/Kbuild
+++ b/arch/avr32/include/asm/Kbuild
@@ -1,3 +1,5 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
generic-y += clkdev.h
generic-y += cputime.h
@@ -11,7 +13,6 @@ generic-y += hash.h
generic-y += irq_regs.h
generic-y += local.h
generic-y += local64.h
-generic-y += mcs_spinlock.h
generic-y += param.h
generic-y += percpu.h
generic-y += preempt.h
diff --git a/arch/blackfin/include/asm/Kbuild b/arch/blackfin/include/asm/Kbuild
index 0d93b9a..6cd2c8a 100644
--- a/arch/blackfin/include/asm/Kbuild
+++ b/arch/blackfin/include/asm/Kbuild
@@ -1,3 +1,5 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
generic-y += auxvec.h
generic-y += bitsperlong.h
@@ -20,7 +22,6 @@ 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 += mman.h
generic-y += msgbuf.h
generic-y += mutex.h
diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
index 8dbdce8..1dbe688 100644
--- a/arch/c6x/include/asm/Kbuild
+++ b/arch/c6x/include/asm/Kbuild
@@ -1,3 +1,5 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
generic-y += atomic.h
generic-y += auxvec.h
@@ -25,7 +27,6 @@ generic-y += irq_regs.h
generic-y += kdebug.h
generic-y += kmap_types.h
generic-y += local.h
-generic-y += mcs_spinlock.h
generic-y += mman.h
generic-y += mmu.h
generic-y += mmu_context.h
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index 35574f5..b286b91 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -1,3 +1,6 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
+
generic-y += barrier.h
generic-y += clkdev.h
generic-y += cputime.h
@@ -5,7 +8,6 @@ generic-y += exec.h
generic-y += hash.h
generic-y += kvm_para.h
generic-y += linkage.h
-generic-y += mcs_spinlock.h
generic-y += module.h
generic-y += preempt.h
generic-y += trace_clock.h
diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild
index 87b95eb..e09f8e7 100644
--- a/arch/frv/include/asm/Kbuild
+++ b/arch/frv/include/asm/Kbuild
@@ -1,8 +1,9 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
generic-y += clkdev.h
generic-y += cputime.h
generic-y += exec.h
generic-y += hash.h
-generic-y += mcs_spinlock.h
generic-y += preempt.h
generic-y += trace_clock.h
diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild
index 1ddcd97..989b82a 100644
--- a/arch/hexagon/include/asm/Kbuild
+++ b/arch/hexagon/include/asm/Kbuild
@@ -1,3 +1,6 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
+
generic-y += auxvec.h
generic-y += barrier.h
generic-y += bug.h
@@ -24,7 +27,6 @@ generic-y += kdebug.h
generic-y += kmap_types.h
generic-y += local.h
generic-y += local64.h
-generic-y += mcs_spinlock.h
generic-y += mman.h
generic-y += msgbuf.h
generic-y += pci.h
diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild
index 0da4aa2..9c100e5 100644
--- a/arch/ia64/include/asm/Kbuild
+++ b/arch/ia64/include/asm/Kbuild
@@ -1,9 +1,10 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
generic-y += clkdev.h
generic-y += exec.h
generic-y += hash.h
generic-y += kvm_para.h
-generic-y += mcs_spinlock.h
generic-y += preempt.h
generic-y += trace_clock.h
generic-y += vtime.h
diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild
index 67779a7..57c22c3 100644
--- a/arch/m32r/include/asm/Kbuild
+++ b/arch/m32r/include/asm/Kbuild
@@ -1,9 +1,10 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
generic-y += clkdev.h
generic-y += cputime.h
generic-y += exec.h
generic-y += hash.h
-generic-y += mcs_spinlock.h
generic-y += module.h
generic-y += preempt.h
generic-y += trace_clock.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index c67c94a..20b69ab 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -1,3 +1,6 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
+
generic-y += barrier.h
generic-y += bitsperlong.h
generic-y += clkdev.h
@@ -16,7 +19,6 @@ 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 += mman.h
generic-y += mutex.h
generic-y += percpu.h
diff --git a/arch/metag/include/asm/Kbuild b/arch/metag/include/asm/Kbuild
index c29ead8..40c08fb 100644
--- a/arch/metag/include/asm/Kbuild
+++ b/arch/metag/include/asm/Kbuild
@@ -1,3 +1,6 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
+
generic-y += auxvec.h
generic-y += bitsperlong.h
generic-y += bugs.h
@@ -24,7 +27,6 @@ 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 += msgbuf.h
generic-y += mutex.h
generic-y += param.h
diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild
index 35b3eca..0173da4 100644
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@ -1,3 +1,5 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
generic-y += barrier.h
generic-y += clkdev.h
@@ -5,7 +7,6 @@ generic-y += cputime.h
generic-y += device.h
generic-y += exec.h
generic-y += hash.h
-generic-y += mcs_spinlock.h
generic-y += preempt.h
generic-y += syscalls.h
generic-y += trace_clock.h
diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild
index 0543918..e7a6309 100644
--- a/arch/mips/include/asm/Kbuild
+++ b/arch/mips/include/asm/Kbuild
@@ -1,10 +1,11 @@
-# MIPS headers
+# Generic wrappers from include/asm-generic for MIPS
+include include/asm-generic/Kbuild.generic
+
generic-y += cputime.h
generic-y += current.h
generic-y += emergency-restart.h
generic-y += hash.h
generic-y += local64.h
-generic-y += mcs_spinlock.h
generic-y += mutex.h
generic-y += parport.h
generic-y += percpu.h
diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbuild
index 654d5ba..0acedc8 100644
--- a/arch/mn10300/include/asm/Kbuild
+++ b/arch/mn10300/include/asm/Kbuild
@@ -1,9 +1,10 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
generic-y += barrier.h
generic-y += clkdev.h
generic-y += cputime.h
generic-y += exec.h
generic-y += hash.h
-generic-y += mcs_spinlock.h
generic-y += preempt.h
generic-y += trace_clock.h
diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild
index 4a80261..3bd2ea3 100644
--- a/arch/openrisc/include/asm/Kbuild
+++ b/arch/openrisc/include/asm/Kbuild
@@ -1,3 +1,6 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
+
generic-y += atomic.h
generic-y += auxvec.h
generic-y += barrier.h
@@ -32,7 +35,6 @@ 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 += mman.h
generic-y += module.h
generic-y += msgbuf.h
diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
index ecf25e6..db2ae76 100644
--- a/arch/parisc/include/asm/Kbuild
+++ b/arch/parisc/include/asm/Kbuild
@@ -1,3 +1,5 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
generic-y += auxvec.h
generic-y += barrier.h
@@ -14,7 +16,6 @@ generic-y += kdebug.h
generic-y += kvm_para.h
generic-y += local.h
generic-y += local64.h
-generic-y += mcs_spinlock.h
generic-y += mutex.h
generic-y += param.h
generic-y += percpu.h
diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild
index 3fb1bc4..16d1cbd 100644
--- a/arch/powerpc/include/asm/Kbuild
+++ b/arch/powerpc/include/asm/Kbuild
@@ -1,7 +1,8 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
generic-y += clkdev.h
generic-y += hash.h
-generic-y += mcs_spinlock.h
generic-y += preempt.h
generic-y += rwsem.h
generic-y += trace_clock.h
diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild
index 57892a8..e601c95 100644
--- a/arch/s390/include/asm/Kbuild
+++ b/arch/s390/include/asm/Kbuild
@@ -1,7 +1,7 @@
-
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
generic-y += clkdev.h
generic-y += hash.h
-generic-y += mcs_spinlock.h
generic-y += preempt.h
generic-y += trace_clock.h
diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild
index f67b3f6..79b3095 100644
--- a/arch/score/include/asm/Kbuild
+++ b/arch/score/include/asm/Kbuild
@@ -1,9 +1,10 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
generic-y += barrier.h
generic-y += clkdev.h
generic-y += cputime.h
generic-y += hash.h
-generic-y += mcs_spinlock.h
generic-y += preempt.h
generic-y += trace_clock.h
generic-y += xor.h
diff --git a/arch/sh/include/asm/Kbuild b/arch/sh/include/asm/Kbuild
index c19e47d..bef0d46 100644
--- a/arch/sh/include/asm/Kbuild
+++ b/arch/sh/include/asm/Kbuild
@@ -1,3 +1,5 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
generic-y += bitsperlong.h
generic-y += cputime.h
@@ -15,7 +17,6 @@ generic-y += irq_regs.h
generic-y += kvm_para.h
generic-y += local.h
generic-y += local64.h
-generic-y += mcs_spinlock.h
generic-y += mman.h
generic-y += msgbuf.h
generic-y += param.h
diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild
index a458218..3b2f282 100644
--- a/arch/sparc/include/asm/Kbuild
+++ b/arch/sparc/include/asm/Kbuild
@@ -1,5 +1,5 @@
-# User exported sparc header files
-
+# Generic wrappers from include/asm-generic for sparc
+include include/asm-generic/Kbuild.generic
generic-y += clkdev.h
generic-y += cputime.h
@@ -11,7 +11,6 @@ generic-y += irq_regs.h
generic-y += linkage.h
generic-y += local.h
generic-y += local64.h
-generic-y += mcs_spinlock.h
generic-y += module.h
generic-y += mutex.h
generic-y += preempt.h
diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild
index 3013a07..19ba1b8 100644
--- a/arch/tile/include/asm/Kbuild
+++ b/arch/tile/include/asm/Kbuild
@@ -1,3 +1,6 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
+
generic-y += bug.h
generic-y += bugs.h
generic-y += clkdev.h
@@ -16,7 +19,6 @@ generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += local.h
generic-y += local64.h
-generic-y += mcs_spinlock.h
generic-y += msgbuf.h
generic-y += mutex.h
generic-y += param.h
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild
index a5e4b60..1c065c3 100644
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@ -1,3 +1,6 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
+
generic-y += barrier.h
generic-y += bug.h
generic-y += clkdev.h
@@ -15,7 +18,6 @@ generic-y += hw_irq.h
generic-y += io.h
generic-y += irq_regs.h
generic-y += kdebug.h
-generic-y += mcs_spinlock.h
generic-y += mutex.h
generic-y += param.h
generic-y += pci.h
diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild
index 1e5fb87..f64e1ba 100644
--- a/arch/unicore32/include/asm/Kbuild
+++ b/arch/unicore32/include/asm/Kbuild
@@ -1,3 +1,5 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
generic-y += atomic.h
generic-y += auxvec.h
@@ -25,7 +27,6 @@ generic-y += irq_regs.h
generic-y += kdebug.h
generic-y += kmap_types.h
generic-y += local.h
-generic-y += mcs_spinlock.h
generic-y += mman.h
generic-y += module.h
generic-y += msgbuf.h
diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild
index 3221167..2c03169 100644
--- a/arch/x86/include/asm/Kbuild
+++ b/arch/x86/include/asm/Kbuild
@@ -1,4 +1,6 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
+
generic-y += clkdev.h
generic-y += early_ioremap.h
generic-y += cputime.h
-generic-y += mcs_spinlock.h
diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild
index c3d20ba..a2cc705 100644
--- a/arch/xtensa/include/asm/Kbuild
+++ b/arch/xtensa/include/asm/Kbuild
@@ -1,3 +1,6 @@
+# Generic wrappers from include/asm-generic
+include include/asm-generic/Kbuild.generic
+
generic-y += bitsperlong.h
generic-y += bug.h
generic-y += clkdev.h
@@ -18,7 +21,6 @@ generic-y += kvm_para.h
generic-y += linkage.h
generic-y += local.h
generic-y += local64.h
-generic-y += mcs_spinlock.h
generic-y += percpu.h
generic-y += preempt.h
generic-y += resource.h
diff --git a/include/asm-generic/Kbuild.generic b/include/asm-generic/Kbuild.generic
new file mode 100644
index 0000000..f44815b
--- /dev/null
+++ b/include/asm-generic/Kbuild.generic
@@ -0,0 +1,6 @@
+# List of generic header files that is used by all architectures
+# This file is included by arch/*/include/asm/Kbuild
+#
+# Keep the list sorted alphabetically
+
+generic-y += mcs_spinlock.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: "David S. Miller" <[email protected]>
---
arch/sparc/include/uapi/asm/Kbuild | 30 ------------------------------
1 file changed, 30 deletions(-)
diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild
index b5843ee..9dcd2d4 100644
--- a/arch/sparc/include/uapi/asm/Kbuild
+++ b/arch/sparc/include/uapi/asm/Kbuild
@@ -5,46 +5,16 @@ include include/uapi/asm-generic/Kbuild.asm
header-y += apc.h
header-y += asi.h
-header-y += auxvec.h
-header-y += bitsperlong.h
-header-y += byteorder.h
header-y += display7seg.h
header-y += envctrl.h
-header-y += errno.h
header-y += fbio.h
-header-y += fcntl.h
-header-y += ioctl.h
-header-y += ioctls.h
-header-y += ipcbuf.h
header-y += jsflash.h
-header-y += kvm_para.h
-header-y += mman.h
-header-y += msgbuf.h
header-y += openpromio.h
-header-y += param.h
header-y += perfctr.h
-header-y += poll.h
-header-y += posix_types.h
header-y += psr.h
header-y += psrcompat.h
header-y += pstate.h
-header-y += ptrace.h
-header-y += resource.h
-header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
-header-y += stat.h
-header-y += statfs.h
-header-y += swab.h
-header-y += termbits.h
-header-y += termios.h
header-y += traps.h
header-y += uctx.h
-header-y += unistd.h
header-y += utrap.h
header-y += watchdog.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Guan Xuetao <[email protected]>
---
arch/unicore32/include/uapi/asm/Kbuild | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild
index 0514d7a..aff532f 100644
--- a/arch/unicore32/include/uapi/asm/Kbuild
+++ b/arch/unicore32/include/uapi/asm/Kbuild
@@ -1,10 +1,5 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-header-y += byteorder.h
-header-y += kvm_para.h
-header-y += ptrace.h
-header-y += sigcontext.h
-header-y += unistd.h
-
+# Wapper from asm-generic
generic-y += kvm_para.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
---
arch/sh/include/uapi/asm/Kbuild | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild
index 60613ae..826b88a 100644
--- a/arch/sh/include/uapi/asm/Kbuild
+++ b/arch/sh/include/uapi/asm/Kbuild
@@ -1,25 +1,13 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-header-y += auxvec.h
-header-y += byteorder.h
header-y += cachectl.h
header-y += cpu-features.h
header-y += hw_breakpoint.h
-header-y += ioctls.h
-header-y += posix_types.h
header-y += posix_types_32.h
header-y += posix_types_64.h
-header-y += ptrace.h
header-y += ptrace_32.h
header-y += ptrace_64.h
-header-y += setup.h
-header-y += sigcontext.h
-header-y += signal.h
header-y += sockios.h
-header-y += stat.h
-header-y += swab.h
-header-y += types.h
-header-y += unistd.h
header-y += unistd_32.h
header-y += unistd_64.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Chris Metcalf <[email protected]>
---
arch/tile/include/uapi/asm/Kbuild | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild
index c20db8e..87d40be 100644
--- a/arch/tile/include/uapi/asm/Kbuild
+++ b/arch/tile/include/uapi/asm/Kbuild
@@ -1,21 +1,9 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-header-y += auxvec.h
-header-y += bitsperlong.h
-header-y += byteorder.h
header-y += cachectl.h
header-y += hardwall.h
-header-y += kvm_para.h
-header-y += mman.h
-header-y += ptrace.h
-header-y += setup.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += stat.h
-header-y += swab.h
header-y += ucontext.h
-header-y += unistd.h
+# Wrapper from asm-generic
generic-y += ucontext.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Martin Schwidefsky <[email protected]>
Cc: Heiko Carstens <[email protected]>
---
arch/s390/include/uapi/asm/Kbuild | 31 -------------------------------
1 file changed, 31 deletions(-)
diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild
index 7366373..5133767 100644
--- a/arch/s390/include/uapi/asm/Kbuild
+++ b/arch/s390/include/uapi/asm/Kbuild
@@ -1,51 +1,20 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-header-y += auxvec.h
-header-y += bitsperlong.h
-header-y += byteorder.h
header-y += chpid.h
header-y += chsc.h
header-y += cmb.h
header-y += dasd.h
header-y += debug.h
-header-y += errno.h
-header-y += fcntl.h
-header-y += ioctl.h
-header-y += ioctls.h
-header-y += ipcbuf.h
-header-y += kvm.h
-header-y += kvm_para.h
header-y += kvm_virtio.h
-header-y += mman.h
header-y += monwriter.h
-header-y += msgbuf.h
-header-y += param.h
-header-y += poll.h
-header-y += posix_types.h
-header-y += ptrace.h
header-y += qeth.h
-header-y += resource.h
header-y += schid.h
header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
header-y += sclp_ctl.h
header-y += sie.h
-header-y += stat.h
-header-y += statfs.h
-header-y += swab.h
header-y += tape390.h
-header-y += termbits.h
-header-y += termios.h
-header-y += types.h
header-y += ucontext.h
-header-y += unistd.h
header-y += virtio-ccw.h
header-y += vtoc.h
header-y += zcrypt.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Paul Mackerras <[email protected]>
---
arch/powerpc/include/uapi/asm/Kbuild | 32 --------------------------------
1 file changed, 32 deletions(-)
diff --git a/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild
index 7a3f795..74d14f3 100644
--- a/arch/powerpc/include/uapi/asm/Kbuild
+++ b/arch/powerpc/include/uapi/asm/Kbuild
@@ -1,46 +1,14 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-header-y += auxvec.h
-header-y += bitsperlong.h
header-y += bootx.h
-header-y += byteorder.h
header-y += cputable.h
header-y += elf.h
header-y += epapr_hcalls.h
-header-y += errno.h
-header-y += fcntl.h
-header-y += ioctl.h
-header-y += ioctls.h
-header-y += ipcbuf.h
-header-y += kvm.h
-header-y += kvm_para.h
-header-y += mman.h
-header-y += msgbuf.h
header-y += nvram.h
-header-y += param.h
header-y += perf_event.h
-header-y += poll.h
-header-y += posix_types.h
header-y += ps3fb.h
-header-y += ptrace.h
-header-y += resource.h
header-y += seccomp.h
-header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
header-y += spu_info.h
-header-y += stat.h
-header-y += statfs.h
-header-y += swab.h
-header-y += termbits.h
-header-y += termios.h
header-y += tm.h
-header-y += types.h
header-y += ucontext.h
-header-y += unistd.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Chen Liqin <[email protected]>
Cc: Lennox Wu <[email protected]>
---
arch/score/include/uapi/asm/Kbuild | 32 --------------------------------
1 file changed, 32 deletions(-)
diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild
index 040178c..b15bf6b 100644
--- a/arch/score/include/uapi/asm/Kbuild
+++ b/arch/score/include/uapi/asm/Kbuild
@@ -1,34 +1,2 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-
-header-y += auxvec.h
-header-y += bitsperlong.h
-header-y += byteorder.h
-header-y += errno.h
-header-y += fcntl.h
-header-y += ioctl.h
-header-y += ioctls.h
-header-y += ipcbuf.h
-header-y += kvm_para.h
-header-y += mman.h
-header-y += msgbuf.h
-header-y += param.h
-header-y += poll.h
-header-y += posix_types.h
-header-y += ptrace.h
-header-y += resource.h
-header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
-header-y += stat.h
-header-y += statfs.h
-header-y += swab.h
-header-y += termbits.h
-header-y += termios.h
-header-y += types.h
-header-y += unistd.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Max Filippov <[email protected]>
---
arch/xtensa/include/uapi/asm/Kbuild | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild
index 56aad54..b15bf6b 100644
--- a/arch/xtensa/include/uapi/asm/Kbuild
+++ b/arch/xtensa/include/uapi/asm/Kbuild
@@ -1,25 +1,2 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-
-header-y += auxvec.h
-header-y += byteorder.h
-header-y += ioctls.h
-header-y += ipcbuf.h
-header-y += mman.h
-header-y += msgbuf.h
-header-y += param.h
-header-y += poll.h
-header-y += posix_types.h
-header-y += ptrace.h
-header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += sigcontext.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
-header-y += stat.h
-header-y += swab.h
-header-y += termbits.h
-header-y += types.h
-header-y += unistd.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
---
arch/x86/include/uapi/asm/Kbuild | 34 +---------------------------------
1 file changed, 1 insertion(+), 33 deletions(-)
diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild
index 09409c4..a8f72f4 100644
--- a/arch/x86/include/uapi/asm/Kbuild
+++ b/arch/x86/include/uapi/asm/Kbuild
@@ -4,61 +4,29 @@ include include/uapi/asm-generic/Kbuild.asm
genhdr-y += unistd_32.h
genhdr-y += unistd_64.h
genhdr-y += unistd_x32.h
-header-y += a.out.h
-header-y += auxvec.h
-header-y += bitsperlong.h
+
header-y += boot.h
header-y += bootparam.h
-header-y += byteorder.h
header-y += debugreg.h
header-y += e820.h
-header-y += errno.h
-header-y += fcntl.h
header-y += hw_breakpoint.h
header-y += hyperv.h
-header-y += ioctl.h
-header-y += ioctls.h
-header-y += ipcbuf.h
header-y += ist.h
-header-y += kvm.h
-header-y += kvm_para.h
header-y += ldt.h
header-y += mce.h
-header-y += mman.h
-header-y += msgbuf.h
header-y += msr-index.h
header-y += msr.h
header-y += mtrr.h
-header-y += param.h
header-y += perf_regs.h
-header-y += poll.h
-header-y += posix_types.h
header-y += posix_types_32.h
header-y += posix_types_64.h
header-y += posix_types_x32.h
header-y += prctl.h
header-y += processor-flags.h
header-y += ptrace-abi.h
-header-y += ptrace.h
-header-y += resource.h
-header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += sigcontext.h
header-y += sigcontext32.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
-header-y += stat.h
-header-y += statfs.h
header-y += svm.h
-header-y += swab.h
-header-y += termbits.h
-header-y += termios.h
-header-y += types.h
header-y += ucontext.h
-header-y += unistd.h
header-y += vm86.h
header-y += vmx.h
header-y += vsyscall.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Jonas Bonn <[email protected]>
---
arch/openrisc/include/uapi/asm/Kbuild | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild
index 80761eb..1ecfc9d 100644
--- a/arch/openrisc/include/uapi/asm/Kbuild
+++ b/arch/openrisc/include/uapi/asm/Kbuild
@@ -1,10 +1,4 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-header-y += byteorder.h
header-y += elf.h
-header-y += kvm_para.h
-header-y += param.h
-header-y += ptrace.h
-header-y += sigcontext.h
-header-y += unistd.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: "James E.J. Bottomley" <[email protected]>
Cc: Helge Deller <[email protected]>
---
arch/parisc/include/uapi/asm/Kbuild | 30 +++---------------------------
1 file changed, 3 insertions(+), 27 deletions(-)
diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild
index 348356c..98f81e9 100644
--- a/arch/parisc/include/uapi/asm/Kbuild
+++ b/arch/parisc/include/uapi/asm/Kbuild
@@ -1,32 +1,8 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+header-y += pdc.h
+
+# Wrapper from asm-generic
generic-y += resource.h
-header-y += bitsperlong.h
-header-y += byteorder.h
-header-y += errno.h
-header-y += fcntl.h
-header-y += ioctl.h
-header-y += ioctls.h
-header-y += ipcbuf.h
-header-y += mman.h
-header-y += msgbuf.h
-header-y += pdc.h
-header-y += posix_types.h
-header-y += ptrace.h
-header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
-header-y += stat.h
-header-y += statfs.h
-header-y += swab.h
-header-y += termbits.h
-header-y += termios.h
-header-y += types.h
-header-y += unistd.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: David Howells <[email protected]>
Cc: Koichi Yasutake <[email protected]>
---
arch/mn10300/include/uapi/asm/Kbuild | 32 --------------------------------
1 file changed, 32 deletions(-)
diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild
index 040178c..b15bf6b 100644
--- a/arch/mn10300/include/uapi/asm/Kbuild
+++ b/arch/mn10300/include/uapi/asm/Kbuild
@@ -1,34 +1,2 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-
-header-y += auxvec.h
-header-y += bitsperlong.h
-header-y += byteorder.h
-header-y += errno.h
-header-y += fcntl.h
-header-y += ioctl.h
-header-y += ioctls.h
-header-y += ipcbuf.h
-header-y += kvm_para.h
-header-y += mman.h
-header-y += msgbuf.h
-header-y += param.h
-header-y += poll.h
-header-y += posix_types.h
-header-y += ptrace.h
-header-y += resource.h
-header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
-header-y += stat.h
-header-y += statfs.h
-header-y += swab.h
-header-y += termbits.h
-header-y += termios.h
-header-y += types.h
-header-y += unistd.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Ralf Baechle <[email protected]>
---
arch/mips/include/uapi/asm/Kbuild | 38 ++++++--------------------------------
1 file changed, 6 insertions(+), 32 deletions(-)
diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild
index 96fe739..e3c0da4 100644
--- a/arch/mips/include/uapi/asm/Kbuild
+++ b/arch/mips/include/uapi/asm/Kbuild
@@ -1,41 +1,15 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-generic-y += auxvec.h
-generic-y += ipcbuf.h
-
header-y += bitfield.h
-header-y += bitsperlong.h
header-y += break.h
-header-y += byteorder.h
header-y += cachectl.h
-header-y += errno.h
-header-y += fcntl.h
header-y += inst.h
-header-y += ioctl.h
-header-y += ioctls.h
-header-y += kvm_para.h
-header-y += mman.h
-header-y += msgbuf.h
-header-y += param.h
-header-y += poll.h
-header-y += posix_types.h
-header-y += ptrace.h
-header-y += resource.h
-header-y += sembuf.h
-header-y += setup.h
header-y += sgidefs.h
-header-y += shmbuf.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
-header-y += stat.h
-header-y += statfs.h
-header-y += swab.h
header-y += sysmips.h
-header-y += termbits.h
-header-y += termios.h
-header-y += types.h
-header-y += unistd.h
+
+# Wrappers from asm-generic
+generic-y += auxvec.h
+generic-y += ipcbuf.h
+
+
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Michal Simek <[email protected]>
---
arch/microblaze/include/uapi/asm/Kbuild | 34 +++------------------------------
1 file changed, 3 insertions(+), 31 deletions(-)
diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild
index 1aac99f..098e942 100644
--- a/arch/microblaze/include/uapi/asm/Kbuild
+++ b/arch/microblaze/include/uapi/asm/Kbuild
@@ -1,36 +1,8 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+header-y += elf.h
+
+#Wrapper from asm-generic
generic-y += types.h
-header-y += auxvec.h
-header-y += bitsperlong.h
-header-y += byteorder.h
-header-y += elf.h
-header-y += errno.h
-header-y += fcntl.h
-header-y += ioctl.h
-header-y += ioctls.h
-header-y += ipcbuf.h
-header-y += kvm_para.h
-header-y += mman.h
-header-y += msgbuf.h
-header-y += param.h
-header-y += poll.h
-header-y += posix_types.h
-header-y += ptrace.h
-header-y += resource.h
-header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
-header-y += stat.h
-header-y += statfs.h
-header-y += swab.h
-header-y += termbits.h
-header-y += termios.h
-header-y += unistd.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: James Hogan <[email protected]>
---
arch/metag/include/uapi/asm/Kbuild | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild
index ab78be2..1f7f43f 100644
--- a/arch/metag/include/uapi/asm/Kbuild
+++ b/arch/metag/include/uapi/asm/Kbuild
@@ -1,14 +1,9 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-header-y += byteorder.h
header-y += ech.h
-header-y += ptrace.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += swab.h
-header-y += unistd.h
+# Wrappers from asm-generic
generic-y += mman.h
generic-y += resource.h
generic-y += setup.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
---
arch/m68k/include/uapi/asm/Kbuild | 33 ++++++++++-----------------------
1 file changed, 10 insertions(+), 23 deletions(-)
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 6a2d257..e09f91d 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -1,16 +1,6 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-generic-y += auxvec.h
-generic-y += msgbuf.h
-generic-y += sembuf.h
-generic-y += shmbuf.h
-generic-y += socket.h
-generic-y += sockios.h
-generic-y += termbits.h
-generic-y += termios.h
-
-header-y += a.out.h
header-y += bootinfo.h
header-y += bootinfo-amiga.h
header-y += bootinfo-apollo.h
@@ -19,17 +9,14 @@ header-y += bootinfo-hp300.h
header-y += bootinfo-mac.h
header-y += bootinfo-q40.h
header-y += bootinfo-vme.h
-header-y += byteorder.h
header-y += cachectl.h
-header-y += fcntl.h
-header-y += ioctls.h
-header-y += param.h
-header-y += poll.h
-header-y += posix_types.h
-header-y += ptrace.h
-header-y += setup.h
-header-y += sigcontext.h
-header-y += signal.h
-header-y += stat.h
-header-y += swab.h
-header-y += unistd.h
+
+# Wrappers from asm-generic
+generic-y += auxvec.h
+generic-y += msgbuf.h
+generic-y += sembuf.h
+generic-y += shmbuf.h
+generic-y += socket.h
+generic-y += sockios.h
+generic-y += termbits.h
+generic-y += termios.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Hirokazu Takata <[email protected]>
---
arch/m32r/include/uapi/asm/Kbuild | 31 -------------------------------
1 file changed, 31 deletions(-)
diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild
index 43937a6..b15bf6b 100644
--- a/arch/m32r/include/uapi/asm/Kbuild
+++ b/arch/m32r/include/uapi/asm/Kbuild
@@ -1,33 +1,2 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-
-header-y += auxvec.h
-header-y += bitsperlong.h
-header-y += byteorder.h
-header-y += errno.h
-header-y += fcntl.h
-header-y += ioctl.h
-header-y += ioctls.h
-header-y += ipcbuf.h
-header-y += mman.h
-header-y += msgbuf.h
-header-y += param.h
-header-y += poll.h
-header-y += posix_types.h
-header-y += ptrace.h
-header-y += resource.h
-header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
-header-y += stat.h
-header-y += statfs.h
-header-y += swab.h
-header-y += termbits.h
-header-y += termios.h
-header-y += types.h
-header-y += unistd.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Richard Kuo <[email protected]>
---
arch/hexagon/include/uapi/asm/Kbuild | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild
index c31706c..3f464d5 100644
--- a/arch/hexagon/include/uapi/asm/Kbuild
+++ b/arch/hexagon/include/uapi/asm/Kbuild
@@ -1,15 +1,5 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-header-y += bitsperlong.h
-header-y += byteorder.h
-header-y += kvm_para.h
-header-y += param.h
-header-y += ptrace.h
header-y += registers.h
-header-y += setup.h
-header-y += sigcontext.h
-header-y += signal.h
-header-y += swab.h
-header-y += unistd.h
header-y += user.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: David Howells <[email protected]>
---
arch/frv/include/uapi/asm/Kbuild | 31 -------------------------------
1 file changed, 31 deletions(-)
diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild
index 42a2b33..d24144b 100644
--- a/arch/frv/include/uapi/asm/Kbuild
+++ b/arch/frv/include/uapi/asm/Kbuild
@@ -1,35 +1,4 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-header-y += auxvec.h
-header-y += bitsperlong.h
-header-y += byteorder.h
-header-y += errno.h
-header-y += fcntl.h
-header-y += ioctl.h
-header-y += ioctls.h
-header-y += ipcbuf.h
-header-y += kvm_para.h
-header-y += mman.h
-header-y += msgbuf.h
-header-y += param.h
-header-y += poll.h
-header-y += posix_types.h
-header-y += ptrace.h
header-y += registers.h
-header-y += resource.h
-header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
-header-y += stat.h
-header-y += statfs.h
-header-y += swab.h
-header-y += termbits.h
-header-y += termios.h
-header-y += types.h
-header-y += unistd.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Tony Luck <[email protected]>
Cc: Fenghua Yu <[email protected]>
---
arch/ia64/include/uapi/asm/Kbuild | 36 +++---------------------------------
1 file changed, 3 insertions(+), 33 deletions(-)
diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild
index 1b3f5eb..f05bc97 100644
--- a/arch/ia64/include/uapi/asm/Kbuild
+++ b/arch/ia64/include/uapi/asm/Kbuild
@@ -1,50 +1,20 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-generic-y += kvm_para.h
-header-y += auxvec.h
-header-y += bitsperlong.h
header-y += break.h
-header-y += byteorder.h
header-y += cmpxchg.h
-header-y += errno.h
-header-y += fcntl.h
header-y += fpu.h
header-y += gcc_intrin.h
header-y += ia64regs.h
header-y += intel_intrin.h
header-y += intrinsics.h
-header-y += ioctl.h
-header-y += ioctls.h
-header-y += ipcbuf.h
-header-y += kvm.h
-header-y += kvm_para.h
-header-y += mman.h
-header-y += msgbuf.h
-header-y += param.h
header-y += perfmon.h
header-y += perfmon_default_smpl.h
-header-y += poll.h
-header-y += posix_types.h
-header-y += ptrace.h
header-y += ptrace_offsets.h
-header-y += resource.h
header-y += rse.h
-header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
-header-y += stat.h
-header-y += statfs.h
-header-y += swab.h
-header-y += termbits.h
-header-y += termios.h
-header-y += types.h
header-y += ucontext.h
-header-y += unistd.h
header-y += ustack.h
+
+# Wrappers from asm-generic
+generic-y += kvm_para.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Mikael Starvik <[email protected]>
Cc: Jesper Nilsson <[email protected]>
---
arch/cris/include/uapi/asm/Kbuild | 31 +------------------------------
1 file changed, 1 insertion(+), 30 deletions(-)
diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild
index 01f66b8..de41e86 100644
--- a/arch/cris/include/uapi/asm/Kbuild
+++ b/arch/cris/include/uapi/asm/Kbuild
@@ -3,37 +3,8 @@ include include/uapi/asm-generic/Kbuild.asm
header-y += ../arch-v10/arch/
header-y += ../arch-v32/arch/
-header-y += auxvec.h
-header-y += bitsperlong.h
-header-y += byteorder.h
-header-y += errno.h
+
header-y += ethernet.h
header-y += etraxgpio.h
-header-y += fcntl.h
-header-y += ioctl.h
-header-y += ioctls.h
-header-y += ipcbuf.h
-header-y += mman.h
-header-y += msgbuf.h
-header-y += param.h
-header-y += poll.h
-header-y += posix_types.h
-header-y += ptrace.h
-header-y += resource.h
header-y += rs485.h
-header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
-header-y += stat.h
-header-y += statfs.h
-header-y += swab.h
header-y += sync_serial.h
-header-y += termbits.h
-header-y += termios.h
-header-y += types.h
-header-y += unistd.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Russell King <[email protected]>
---
arch/arm/include/uapi/asm/Kbuild | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild
index 70a1c9d..aa17aa8 100644
--- a/arch/arm/include/uapi/asm/Kbuild
+++ b/arch/arm/include/uapi/asm/Kbuild
@@ -1,19 +1,5 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-header-y += byteorder.h
-header-y += fcntl.h
header-y += hwcap.h
-header-y += ioctls.h
-header-y += kvm_para.h
-header-y += mman.h
header-y += perf_regs.h
-header-y += posix_types.h
-header-y += ptrace.h
-header-y += setup.h
-header-y += sigcontext.h
-header-y += signal.h
-header-y += stat.h
-header-y += statfs.h
-header-y += swab.h
-header-y += unistd.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Steven Miao <[email protected]>
---
arch/blackfin/include/uapi/asm/Kbuild | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild
index 0bd28f7..c226f31 100644
--- a/arch/blackfin/include/uapi/asm/Kbuild
+++ b/arch/blackfin/include/uapi/asm/Kbuild
@@ -2,18 +2,5 @@
include include/uapi/asm-generic/Kbuild.asm
header-y += bfin_sport.h
-header-y += byteorder.h
header-y += cachectl.h
-header-y += fcntl.h
header-y += fixed_code.h
-header-y += ioctls.h
-header-y += kvm_para.h
-header-y += poll.h
-header-y += posix_types.h
-header-y += ptrace.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += stat.h
-header-y += swab.h
-header-y += unistd.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Haavard Skinnemoen <[email protected]>
Cc: Hans-Christian Egtvedt <[email protected]>
---
arch/avr32/include/uapi/asm/Kbuild | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild
index 08d8a3d..6e33c08 100644
--- a/arch/avr32/include/uapi/asm/Kbuild
+++ b/arch/avr32/include/uapi/asm/Kbuild
@@ -1,26 +1,9 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-header-y += auxvec.h
-header-y += byteorder.h
header-y += cachectl.h
-header-y += msgbuf.h
-header-y += param.h
-header-y += posix_types.h
-header-y += ptrace.h
-header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += sigcontext.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
-header-y += stat.h
-header-y += swab.h
-header-y += termbits.h
-header-y += termios.h
-header-y += types.h
-header-y += unistd.h
+
+# Wrappers from asm-generic
generic-y += bitsperlong.h
generic-y += errno.h
generic-y += fcntl.h
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Catalin Marinas <[email protected]>
Cc: Will Deacon <[email protected]>
---
arch/arm64/include/uapi/asm/Kbuild | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild
index 942376d..aa17aa8 100644
--- a/arch/arm64/include/uapi/asm/Kbuild
+++ b/arch/arm64/include/uapi/asm/Kbuild
@@ -1,21 +1,5 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-generic-y += kvm_para.h
-
-header-y += auxvec.h
-header-y += bitsperlong.h
-header-y += byteorder.h
-header-y += fcntl.h
header-y += hwcap.h
-header-y += kvm_para.h
header-y += perf_regs.h
-header-y += param.h
-header-y += ptrace.h
-header-y += setup.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += stat.h
-header-y += statfs.h
-header-y += unistd.h
--
1.9.3
We no longer call this Makefile with gen set to anything,
so we can simplify logic to find dir for generated files.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: David Howells <[email protected]>
---
scripts/Makefile.headersinst | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index 3f72031..4718758 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -7,9 +7,6 @@
#
# ==========================================================================
-# generated header directory
-gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj)))
-
kbuild-file := $(srctree)/$(obj)/Kbuild
include $(kbuild-file)
@@ -33,7 +30,7 @@ check-file := $(installdir)/.check
wrapper-files := $(filter $(header-y), $(generic-y))
srcdir := $(srctree)/$(obj)
-gendir := $(objtree)/$(gen)
+gendir := $(objtree)/$(subst include/,include/generated/,$(obj))
# all headers files for this dir
header-y := $(filter-out $(generic-y), $(header-y))
--
1.9.3
Remove redundant assignments.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Richard Henderson <[email protected]>
Cc: Ivan Kokshaysky <[email protected]>
Cc: Matt Turner <[email protected]>
---
arch/alpha/include/uapi/asm/Kbuild | 32 --------------------------------
1 file changed, 32 deletions(-)
diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild
index d96f2ef..cc2b567 100644
--- a/arch/alpha/include/uapi/asm/Kbuild
+++ b/arch/alpha/include/uapi/asm/Kbuild
@@ -1,43 +1,11 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-header-y += a.out.h
-header-y += auxvec.h
-header-y += bitsperlong.h
-header-y += byteorder.h
header-y += compiler.h
header-y += console.h
-header-y += errno.h
-header-y += fcntl.h
header-y += fpu.h
header-y += gentrap.h
-header-y += ioctl.h
-header-y += ioctls.h
-header-y += ipcbuf.h
-header-y += kvm_para.h
-header-y += mman.h
-header-y += msgbuf.h
header-y += pal.h
-header-y += param.h
-header-y += poll.h
-header-y += posix_types.h
-header-y += ptrace.h
header-y += reg.h
header-y += regdef.h
-header-y += resource.h
-header-y += sembuf.h
-header-y += setup.h
-header-y += shmbuf.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
-header-y += stat.h
-header-y += statfs.h
-header-y += swab.h
header-y += sysinfo.h
-header-y += termbits.h
-header-y += termios.h
-header-y += types.h
-header-y += unistd.h
--
1.9.3
There are no more Kbuild files outside uapi directories used
for exported headers so drop support for these.
Also update documentation to reference the correct files.
Except for destination-y which has no in-tree users at the moment.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: David Howells <[email protected]>
---
Documentation/kbuild/makefiles.txt | 4 ++--
scripts/Makefile.headersinst | 17 +----------------
2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index c600e2f..98b89bf 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -1294,7 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file.
header-y specify header files to be exported.
Example:
- #include/linux/Kbuild
+ #include/linux/uapi/Kbuild
header-y += usb/
header-y += aio_abi.h
@@ -1314,7 +1314,7 @@ See subsequent chapter for the syntax of the Kbuild file.
up in another directory when doing 'make O=...' builds.
Example:
- #include/linux/Kbuild
+ #include/linux/uapi/Kbuild
genhdr-y += version.h
--- 7.3 destination-y
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index 8ccf830..3f72031 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -16,11 +16,6 @@ include $(kbuild-file)
# called may set destination dir (when installing to asm/)
_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj)))
-old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild
-ifneq ($(wildcard $(old-kbuild-file)),)
-include $(old-kbuild-file)
-endif
-
include scripts/Kbuild.include
installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst))
@@ -40,8 +35,6 @@ wrapper-files := $(filter $(header-y), $(generic-y))
srcdir := $(srctree)/$(obj)
gendir := $(objtree)/$(gen)
-oldsrcdir := $(srctree)/$(subst /uapi,,$(obj))
-
# all headers files for this dir
header-y := $(filter-out $(generic-y), $(header-y))
all-files := $(header-y) $(genhdr-y) $(wrapper-files)
@@ -52,13 +45,6 @@ input-files1 := $(foreach hdr, $(header-y), \
$(wildcard $(srcdir)/$(hdr))) \
)
input-files1-name := $(notdir $(input-files1))
-input-files2 := $(foreach hdr, $(header-y), \
- $(if $(wildcard $(srcdir)/$(hdr)),, \
- $(if $(wildcard $(oldsrcdir)/$(hdr)), \
- $(wildcard $(oldsrcdir)/$(hdr)), \
- $(error Missing UAPI file $(srcdir)/$(hdr))) \
- ))
-input-files2-name := $(notdir $(input-files2))
input-files3 := $(foreach hdr, $(genhdr-y), \
$(if $(wildcard $(gendir)/$(hdr)), \
$(wildcard $(gendir)/$(hdr)), \
@@ -79,7 +65,6 @@ quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
file$(if $(word 2, $(all-files)),s))
cmd_install = \
$(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \
- $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \
$(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \
for F in $(wrapper-files); do \
echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \
@@ -106,7 +91,7 @@ __headersinst: $(subdirs) $(install-file)
@:
targets += $(install-file)
-$(install-file): scripts/headers_install.sh $(input-files1) $(input-files2) $(input-files3) FORCE
+$(install-file): scripts/headers_install.sh $(input-files1) $(input-files3) FORCE
$(if $(unwanted),$(call cmd,remove),)
$(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
$(call if_changed,install)
--
1.9.3
Drop unused assignment in Kbuild file.
The unistd* files are exported using the Kbuild file in uapi/*
and the assignments in this file was left-overs from the past.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: David Howells <[email protected]>
---
arch/x86/include/asm/Kbuild | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild
index 3ca9762..3221167 100644
--- a/arch/x86/include/asm/Kbuild
+++ b/arch/x86/include/asm/Kbuild
@@ -1,9 +1,3 @@
-
-
-genhdr-y += unistd_32.h
-genhdr-y += unistd_64.h
-genhdr-y += unistd_x32.h
-
generic-y += clkdev.h
generic-y += early_ioremap.h
generic-y += cputime.h
--
1.9.3
Drop an unused Kbuild file - it was anyway empty
Drop an irrelevent assignment to header-y
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Chris Metcalf <[email protected]>
Cc: David Howells <[email protected]>
---
arch/tile/include/arch/Kbuild | 1 -
arch/tile/include/asm/Kbuild | 3 ---
2 files changed, 4 deletions(-)
delete mode 100644 arch/tile/include/arch/Kbuild
diff --git a/arch/tile/include/arch/Kbuild b/arch/tile/include/arch/Kbuild
deleted file mode 100644
index 3751c9f..0000000
--- a/arch/tile/include/arch/Kbuild
+++ /dev/null
@@ -1 +0,0 @@
-# Tile arch headers
diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild
index 0aa5675..3013a07 100644
--- a/arch/tile/include/asm/Kbuild
+++ b/arch/tile/include/asm/Kbuild
@@ -1,6 +1,3 @@
-
-header-y += ../arch/
-
generic-y += bug.h
generic-y += bugs.h
generic-y += clkdev.h
--
1.9.3
header-y assignemnt in this file has no effect - drop it.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Chen Liqin <[email protected]>
Cc: Lennox Wu <[email protected]>
Cc: David Howells <[email protected]>
---
arch/score/include/asm/Kbuild | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild
index 2f947ab..f67b3f6 100644
--- a/arch/score/include/asm/Kbuild
+++ b/arch/score/include/asm/Kbuild
@@ -1,7 +1,4 @@
-header-y +=
-
-
generic-y += barrier.h
generic-y += clkdev.h
generic-y += cputime.h
--
1.9.3
ucontext.h is already specified in include/uapi/asm-generic/Kbuild
so this is redundant.
Signed-off-by: Sam Ravnborg <[email protected]>
Cc: Richard Kuo <[email protected]>
Cc: linux-hexagon <[email protected]>
Cc: David Howells <[email protected]>
---
arch/hexagon/include/asm/Kbuild | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild
index 0e69796..1ddcd97 100644
--- a/arch/hexagon/include/asm/Kbuild
+++ b/arch/hexagon/include/asm/Kbuild
@@ -1,6 +1,3 @@
-
-header-y += ucontext.h
-
generic-y += auxvec.h
generic-y += barrier.h
generic-y += bug.h
--
1.9.3
On Monday 14 July 2014 17:06:09 Sam Ravnborg wrote:
>
> What tree is the best for this stuff?
> I would suggest to go via the asm-generic tree that Arnd has.
> But it also touches a lot of architectures so Andrews -mm or
> kbuild#misc could be used.
I rarely have anything to send for the asm-generic tree, usually I
rely on things getting merged the other way round, through whoever
has an interest in changing asm-generic.
Arnd
On Mon, Jul 14, 2014 at 04:08:41PM +0100, Sam Ravnborg wrote:
> Remove redundant assignments.
>
> Signed-off-by: Sam Ravnborg <[email protected]>
> Cc: Catalin Marinas <[email protected]>
> Cc: Will Deacon <[email protected]>
Acked-by: Catalin Marinas <[email protected]>
Around Mon 14 Jul 2014 17:08:42 +0200 or thereabout, Sam Ravnborg wrote:
> Remove redundant assignments.
>
Fantastic, reducing code is the best patches.
> Signed-off-by: Sam Ravnborg <[email protected]>
> Cc: Haavard Skinnemoen <[email protected]>
> Cc: Hans-Christian Egtvedt <[email protected]>
Acked-by: Hans-Christian Egtvedt <[email protected]>
> ---
> arch/avr32/include/uapi/asm/Kbuild | 21 ++-------------------
> 1 file changed, 2 insertions(+), 19 deletions(-)
>
> diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild
> index 08d8a3d..6e33c08 100644
> --- a/arch/avr32/include/uapi/asm/Kbuild
> +++ b/arch/avr32/include/uapi/asm/Kbuild
> @@ -1,26 +1,9 @@
> # UAPI Header export list
> include include/uapi/asm-generic/Kbuild.asm
>
> -header-y += auxvec.h
> -header-y += byteorder.h
> header-y += cachectl.h
> -header-y += msgbuf.h
> -header-y += param.h
> -header-y += posix_types.h
> -header-y += ptrace.h
> -header-y += sembuf.h
> -header-y += setup.h
> -header-y += shmbuf.h
> -header-y += sigcontext.h
> -header-y += signal.h
> -header-y += socket.h
> -header-y += sockios.h
> -header-y += stat.h
> -header-y += swab.h
> -header-y += termbits.h
> -header-y += termios.h
> -header-y += types.h
> -header-y += unistd.h
> +
> +# Wrappers from asm-generic
> generic-y += bitsperlong.h
> generic-y += errno.h
> generic-y += fcntl.h
--
mvh
Hans-Christian Egtvedt
From: Sam Ravnborg <[email protected]>
Date: Mon, 14 Jul 2014 17:09:01 +0200
> Remove redundant assignments.
>
> Signed-off-by: Sam Ravnborg <[email protected]>
Acked-by: David S. Miller <[email protected]>
On Mon, 2014-07-14 at 17:08 +0200, Sam Ravnborg wrote:
> Remove redundant assignments.
> Also drop kvm_para.h wrapper as it is never referenced from c6x code.
>
> Signed-off-by: Sam Ravnborg <[email protected]>
> Cc: Mark Salter <[email protected]>
> Cc: Aurelien Jacquiot <[email protected]>
> ---
Acked-by: Mark Salter <[email protected]>
> arch/c6x/include/uapi/asm/Kbuild | 10 ----------
> 1 file changed, 10 deletions(-)
>
> diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild
> index e9bc2b2..b15bf6b 100644
> --- a/arch/c6x/include/uapi/asm/Kbuild
> +++ b/arch/c6x/include/uapi/asm/Kbuild
> @@ -1,12 +1,2 @@
> # UAPI Header export list
> include include/uapi/asm-generic/Kbuild.asm
> -
> -generic-y += kvm_para.h
> -
> -header-y += byteorder.h
> -header-y += kvm_para.h
> -header-y += ptrace.h
> -header-y += setup.h
> -header-y += sigcontext.h
> -header-y += swab.h
> -header-y += unistd.h
On Mon, Jul 14, 2014 at 05:34:59PM +0200, Arnd Bergmann wrote:
> On Monday 14 July 2014 17:06:09 Sam Ravnborg wrote:
> >
> > What tree is the best for this stuff?
> > I would suggest to go via the asm-generic tree that Arnd has.
> > But it also touches a lot of architectures so Andrews -mm or
> > kbuild#misc could be used.
>
> I rarely have anything to send for the asm-generic tree, usually I
> rely on things getting merged the other way round, through whoever
> has an interest in changing asm-generic.
OK - I will try to channel it through another tree.
If you could fine time to review "[PATCH 38/38] asm-generic: introduc Kbuild.generic"
I would be happy.
The patch itself is simple - but it is more if it really
is relevant. I am not sure how many files from asm-generic that
in reality end up being used by all architectures.
A possibility is to extend this so we can drop a specific file
from a few architectures could be added.
We could for example use this to add preempt.h for all architectures
except x86 that provide a x86 specific version.
But I decided to start simple.
Btw. I should have made this patch separate from the rest.
I just added it on top of the others since it touched the same area.
I will keep it separate in future submissions.
Sam
On 07/14/2014 08:08 AM, Sam Ravnborg wrote:
> Drop unused assignment in Kbuild file.
> The unistd* files are exported using the Kbuild file in uapi/*
> and the assignments in this file was left-overs from the past.
>
> Signed-off-by: Sam Ravnborg <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Cc: "H. Peter Anvin" <[email protected]>
> Cc: David Howells <[email protected]>
> ---
> arch/x86/include/asm/Kbuild | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild
> index 3ca9762..3221167 100644
> --- a/arch/x86/include/asm/Kbuild
> +++ b/arch/x86/include/asm/Kbuild
> @@ -1,9 +1,3 @@
> -
> -
> -genhdr-y += unistd_32.h
> -genhdr-y += unistd_64.h
> -genhdr-y += unistd_x32.h
> -
> generic-y += clkdev.h
> generic-y += early_ioremap.h
> generic-y += cputime.h
>
Acked-by: H. Peter Anvin <[email protected]>
On 07/14/2014 08:09 AM, Sam Ravnborg wrote:
> Remove redundant assignments.
>
> Signed-off-by: Sam Ravnborg <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Cc: "H. Peter Anvin" <[email protected]>
Acked-by: H. Peter Anvin <[email protected]>
On Monday 14 July 2014 17:09:06 Sam Ravnborg wrote:
> Kbuild.generic is for asm-generic files that are used
> by all architectures.
> So rather than adding the file to the individual Kbuild files
> it is enough to add it to this file
>
> Signed-off-by: Sam Ravnborg <[email protected]>
> Cc: Arnd Bergmann <[email protected]>
This has been suggested in the past, and I remember there being some
controversy around it, but I don't really mind it, so you have my
ok in principle. Two points though that we have to work out first:
> diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
> index 96e54be..e09f8e7 100644
> --- a/arch/alpha/include/asm/Kbuild
> +++ b/arch/alpha/include/asm/Kbuild
> @@ -1,9 +1,9 @@
> -
> +# Generic wrappers from include/asm-generic
> +include include/asm-generic/Kbuild.generic
We have the same kind of header for the uapi files, it's called
include/uapi/asm-generic/Kbuild.asm. I don't know why I picked that
name back then, Kbuild.generic seems more appropriate, but I think
either way it would be good to be consistent.
Can you either rename the existing file to Kbuild.generic, or call
the new one Kbuild.asm as well?
> diff --git a/include/asm-generic/Kbuild.generic b/include/asm-generic/Kbuild.generic
> new file mode 100644
> index 0000000..f44815b
> --- /dev/null
> +++ b/include/asm-generic/Kbuild.generic
> @@ -0,0 +1,6 @@
> +# List of generic header files that is used by all architectures
> +# This file is included by arch/*/include/asm/Kbuild
> +#
> +# Keep the list sorted alphabetically
> +
> +generic-y += mcs_spinlock.h
We have to make up our minds what we want from this list. At the moment,
you list only one file because that is the only file that is shared across
all architectures. The idea for this file is that architectures /can/
provide their own (according to the comments in this file), but no
architecture actually does. A few thoughts on this:
* Normally we just delete any header file that is common across all
architectures, and change the files including it (only one is present
in this case) not to include it. If we do that, your new file becomes
pointless.
* If one architecture actually starts providing its own version of this
file, we'd have to revert your patch first, which really defeats the
purpose of doing it in the first place.
* We could improve the situation if the definition of this list is
changed so we only generate the generic header files that are not
already provided by an architecture. If we do this, we can consolidate
a lot more here, which is nice, but the cost would be equivalent to
another level of indirection and a potential for subtle bugs if it's
not done very careful.
Arnd
On 14/07/14 16:08, Sam Ravnborg wrote:
> The following files are not used - and they serve no purpose.
> Delete them.
>
> Signed-off-by: Sam Ravnborg <[email protected]>
> Cc: David Howells <[email protected]>
> ---
> include/Kbuild | 2 --
> include/scsi/fc/Kbuild | 0
> include/video/Kbuild | 0
> 3 files changed, 2 deletions(-)
> delete mode 100644 include/Kbuild
> delete mode 100644 include/scsi/fc/Kbuild
> delete mode 100644 include/video/Kbuild
include/asm-generic/Kbuild.asm could go too since it isn't included
anywhere.
Cheers
James
On Tue, Jul 15, 2014 at 10:06:35AM +0100, James Hogan wrote:
> On 14/07/14 16:08, Sam Ravnborg wrote:
> > The following files are not used - and they serve no purpose.
> > Delete them.
> >
> > Signed-off-by: Sam Ravnborg <[email protected]>
> > Cc: David Howells <[email protected]>
> > ---
> > include/Kbuild | 2 --
> > include/scsi/fc/Kbuild | 0
> > include/video/Kbuild | 0
> > 3 files changed, 2 deletions(-)
> > delete mode 100644 include/Kbuild
> > delete mode 100644 include/scsi/fc/Kbuild
> > delete mode 100644 include/video/Kbuild
>
> include/asm-generic/Kbuild.asm could go too since it isn't included
> anywhere.
Good catch. I recall that I was wondering what the purpose of the file
was but forgot about it again.
Will delete in in v2 of this patch-set.
Sam
On 14/07/14 16:08, Sam Ravnborg wrote:
> Remove redundant assignments.
>
> Signed-off-by: Sam Ravnborg <[email protected]>
> Cc: James Hogan <[email protected]>
Acked-by: James Hogan <[email protected]>
Thanks!
James
> ---
> arch/metag/include/uapi/asm/Kbuild | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild
> index ab78be2..1f7f43f 100644
> --- a/arch/metag/include/uapi/asm/Kbuild
> +++ b/arch/metag/include/uapi/asm/Kbuild
> @@ -1,14 +1,9 @@
> # UAPI Header export list
> include include/uapi/asm-generic/Kbuild.asm
>
> -header-y += byteorder.h
> header-y += ech.h
> -header-y += ptrace.h
> -header-y += sigcontext.h
> -header-y += siginfo.h
> -header-y += swab.h
> -header-y += unistd.h
>
> +# Wrappers from asm-generic
> generic-y += mman.h
> generic-y += resource.h
> generic-y += setup.h
>
On 14/07/14 16:08, Sam Ravnborg wrote:
> Remove redundant assignments.
>
> Signed-off-by: Sam Ravnborg <[email protected]>
> Cc: Catalin Marinas <[email protected]>
> Cc: Will Deacon <[email protected]>
> ---
> arch/arm64/include/uapi/asm/Kbuild | 16 ----------------
> 1 file changed, 16 deletions(-)
>
> diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild
> index 942376d..aa17aa8 100644
> --- a/arch/arm64/include/uapi/asm/Kbuild
> +++ b/arch/arm64/include/uapi/asm/Kbuild
> @@ -1,21 +1,5 @@
> # UAPI Header export list
> include include/uapi/asm-generic/Kbuild.asm
>
> -generic-y += kvm_para.h
Don't you need this in order for it to be picked up by patch 9 and
exported? I guess the non-uapi generic-y += kvm_para.h might be
redundant though.
Cheers
James
> -
> -header-y += auxvec.h
> -header-y += bitsperlong.h
> -header-y += byteorder.h
> -header-y += fcntl.h
> header-y += hwcap.h
> -header-y += kvm_para.h
> header-y += perf_regs.h
> -header-y += param.h
> -header-y += ptrace.h
> -header-y += setup.h
> -header-y += sigcontext.h
> -header-y += siginfo.h
> -header-y += signal.h
> -header-y += stat.h
> -header-y += statfs.h
> -header-y += unistd.h
>
On 14/07/14 16:09, Sam Ravnborg wrote:
> Remove redundant assignments.
>
> Signed-off-by: Sam Ravnborg <[email protected]>
> Cc: Guan Xuetao <[email protected]>
> ---
> arch/unicore32/include/uapi/asm/Kbuild | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild
> index 0514d7a..aff532f 100644
> --- a/arch/unicore32/include/uapi/asm/Kbuild
> +++ b/arch/unicore32/include/uapi/asm/Kbuild
> @@ -1,10 +1,5 @@
> # UAPI Header export list
> include include/uapi/asm-generic/Kbuild.asm
>
> -header-y += byteorder.h
> -header-y += kvm_para.h
> -header-y += ptrace.h
> -header-y += sigcontext.h
> -header-y += unistd.h
> -
> +# Wapper from asm-generic
> generic-y += kvm_para.h
>
You dropped the generic-y += kvm_para.h for arm64 & c6x, but not for
unicore, avr32 & ia64 patch, which seems a bit inconsistent. Was there
some reason behind that?
AFACT the non-uapi kvm_para.h is needed (e.g. by using the generic
non-uapi one) by kernel/watchdog.c for
kvm_check_and_clear_guest_paused(), so all arches should have at least
generic-y += kvm_para.h (or their own one) for non-uapi, even if they
have a uapi one too.
For UAPI, they're presumably only needed for architectures which support
KVM (s390, ia64, arm, powerpc, arm64, mips, x86 all provide an asm/kvm.h).
Is that right? Clearly there's some cleanup to do for kvm_para.h (which
is what made me look at the header issues previously).
Cheers
James
Hi James.
> > +# Wapper from asm-generic
> > generic-y += kvm_para.h
> >
>
> You dropped the generic-y += kvm_para.h for arm64 & c6x, but not for
> unicore, avr32 & ia64 patch, which seems a bit inconsistent. Was there
> some reason behind that?
I was fooling around with kvm_para.h and in both cases dropping
them was wrong.
kvm_para.h shows the current nightmare when you want to add a header
file that for most architectures has a generic implementation, but
in a few cases have a dedicated implementation.
This is the same point that Arnd raises.
I will fix it up so kvm_para.h is again specified for arm64 + c6x.
And then will address the whole mess later if I manage to come up
with something that is acceptable (simple enough).
Thanks for the review!
Sam
Thanks :)
Acked-by: Lennox Wu<[email protected]>
2014-07-14 23:08 GMT+08:00 Sam Ravnborg <[email protected]>:
> header-y assignemnt in this file has no effect - drop it.
>
> Signed-off-by: Sam Ravnborg <[email protected]>
> Cc: Chen Liqin <[email protected]>
> Cc: Lennox Wu <[email protected]>
> Cc: David Howells <[email protected]>
> ---
> arch/score/include/asm/Kbuild | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild
> index 2f947ab..f67b3f6 100644
> --- a/arch/score/include/asm/Kbuild
> +++ b/arch/score/include/asm/Kbuild
> @@ -1,7 +1,4 @@
>
> -header-y +=
> -
> -
> generic-y += barrier.h
> generic-y += clkdev.h
> generic-y += cputime.h
> --
> 1.9.3
>
On Tue, Jul 15, 2014 at 09:03:00AM +0200, Arnd Bergmann wrote:
> On Monday 14 July 2014 17:09:06 Sam Ravnborg wrote:
> > Kbuild.generic is for asm-generic files that are used
> > by all architectures.
> > So rather than adding the file to the individual Kbuild files
> > it is enough to add it to this file
> >
> > Signed-off-by: Sam Ravnborg <[email protected]>
> > Cc: Arnd Bergmann <[email protected]>
>
> This has been suggested in the past, and I remember there being some
> controversy around it, but I don't really mind it, so you have my
> ok in principle. Two points though that we have to work out first:
>
> > diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
> > index 96e54be..e09f8e7 100644
> > --- a/arch/alpha/include/asm/Kbuild
> > +++ b/arch/alpha/include/asm/Kbuild
> > @@ -1,9 +1,9 @@
> > -
> > +# Generic wrappers from include/asm-generic
> > +include include/asm-generic/Kbuild.generic
>
> We have the same kind of header for the uapi files, it's called
> include/uapi/asm-generic/Kbuild.asm. I don't know why I picked that
> name back then, Kbuild.generic seems more appropriate, but I think
> either way it would be good to be consistent.
>
> Can you either rename the existing file to Kbuild.generic, or call
> the new one Kbuild.asm as well?
There was already a file name Kbuild.asm in that directory - therefore I picked another name.
But the original Kbuild.asm was in reality not used so I have deleted it in
my patch-set and will re-introduce it with a different purpose.
People are used to the name "Kbuild.asm" so let's stick to that.
> * We could improve the situation if the definition of this list is
> changed so we only generate the generic header files that are not
> already provided by an architecture. If we do this, we can consolidate
> a lot more here, which is nice, but the cost would be equivalent to
> another level of indirection and a potential for subtle bugs if it's
> not done very careful.
I think this is the way to go - and will try to give it a spin.
Something along these lines:
include/asm-generic/Kbuild.asm will include a list of all header files
that shall be present for any architecture and may come from asm-generic.
If the architecture provide there own file - good.
If the architecture do not provide their own file => create wrapper.
The arch provided header file comes first in the search path,
so if a wrapper was generated and later a dedicated file is added
then we will use the dedicated file and not the wrapper that points
back to asm-generic.
The same logic applies for uapi/asm-generic as well.
I will try to come up with an implementation of this,
then we can see if this flys.
Sam
On Thursday 17 July 2014 12:38:15 Sam Ravnborg wrote:
> > * We could improve the situation if the definition of this list is
> > changed so we only generate the generic header files that are not
> > already provided by an architecture. If we do this, we can consolidate
> > a lot more here, which is nice, but the cost would be equivalent to
> > another level of indirection and a potential for subtle bugs if it's
> > not done very careful.
> I think this is the way to go - and will try to give it a spin.
>
> Something along these lines:
> include/asm-generic/Kbuild.asm will include a list of all header files
> that shall be present for any architecture and may come from asm-generic.
> If the architecture provide there own file - good.
> If the architecture do not provide their own file => create wrapper.
>
> The arch provided header file comes first in the search path,
> so if a wrapper was generated and later a dedicated file is added
> then we will use the dedicated file and not the wrapper that points
> back to asm-generic.
>
> The same logic applies for uapi/asm-generic as well.
>
> I will try to come up with an implementation of this,
> then we can see if this flys.
Ok, sounds good. Thanks!
Arnd
On 7/14/2014 11:08 AM, Sam Ravnborg wrote:
> Drop an unused Kbuild file - it was anyway empty
> Drop an irrelevent assignment to header-y
>
> Signed-off-by: Sam Ravnborg <[email protected]>
> Cc: Chris Metcalf <[email protected]>
> Cc: David Howells <[email protected]>
> ---
> arch/tile/include/arch/Kbuild | 1 -
> arch/tile/include/asm/Kbuild | 3 ---
> 2 files changed, 4 deletions(-)
> delete mode 100644 arch/tile/include/arch/Kbuild
>
> diff --git a/arch/tile/include/arch/Kbuild b/arch/tile/include/arch/Kbuild
> deleted file mode 100644
> index 3751c9f..0000000
> --- a/arch/tile/include/arch/Kbuild
> +++ /dev/null
> @@ -1 +0,0 @@
> -# Tile arch headers
Acked-by: Chris Metcalf <[email protected]>
for this piece. David Howells left these with just comments originally,
but removing the file entirely seems fine too.
> diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild
> index 0aa5675..3013a07 100644
> --- a/arch/tile/include/asm/Kbuild
> +++ b/arch/tile/include/asm/Kbuild
> @@ -1,6 +1,3 @@
> -
> -header-y += ../arch/
> -
> generic-y += bug.h
> generic-y += bugs.h
> generic-y += clkdev.h
Nack for this patch. The arch/ headers are all intended to be shared by the
kernel and userspace, so we install them from the kernel. This one header-y
line installs the 16 header files in usr/include/arch/*.h. If there's a
better way to make that happen, that would be fine too, of course.
Arguably we could provide them separately (a tarball from tilera.com or
something) but frankly, this just makes the standard build flows for kernel,
gcc, and glibc more non-standard for tile, which seems like a bad thing.
--
Chris Metcalf, Tilera Corp.
http://www.tilera.com
On 7/14/2014 11:09 AM, Sam Ravnborg wrote:
> Remove redundant assignments.
>
> Signed-off-by: Sam Ravnborg<[email protected]>
> Cc: Chris Metcalf<[email protected]>
> ---
> arch/tile/include/uapi/asm/Kbuild | 14 +-------------
> 1 file changed, 1 insertion(+), 13 deletions(-)
Acked-by: Chris Metcalf <[email protected]>
--
Chris Metcalf, Tilera Corp.
http://www.tilera.com
Acked-by: Lennox Wu <[email protected]>
2014-07-14 23:08 GMT+08:00 Sam Ravnborg <[email protected]>:
> Remove redundant assignments.
>
> Signed-off-by: Sam Ravnborg <[email protected]>
> Cc: Chen Liqin <[email protected]>
> Cc: Lennox Wu <[email protected]>
> ---
> arch/score/include/uapi/asm/Kbuild | 32 --------------------------------
> 1 file changed, 32 deletions(-)
>
> diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild
> index 040178c..b15bf6b 100644
> --- a/arch/score/include/uapi/asm/Kbuild
> +++ b/arch/score/include/uapi/asm/Kbuild
> @@ -1,34 +1,2 @@
> # UAPI Header export list
> include include/uapi/asm-generic/Kbuild.asm
> -
> -header-y += auxvec.h
> -header-y += bitsperlong.h
> -header-y += byteorder.h
> -header-y += errno.h
> -header-y += fcntl.h
> -header-y += ioctl.h
> -header-y += ioctls.h
> -header-y += ipcbuf.h
> -header-y += kvm_para.h
> -header-y += mman.h
> -header-y += msgbuf.h
> -header-y += param.h
> -header-y += poll.h
> -header-y += posix_types.h
> -header-y += ptrace.h
> -header-y += resource.h
> -header-y += sembuf.h
> -header-y += setup.h
> -header-y += shmbuf.h
> -header-y += sigcontext.h
> -header-y += siginfo.h
> -header-y += signal.h
> -header-y += socket.h
> -header-y += sockios.h
> -header-y += stat.h
> -header-y += statfs.h
> -header-y += swab.h
> -header-y += termbits.h
> -header-y += termios.h
> -header-y += types.h
> -header-y += unistd.h
> --
> 1.9.3
>
On Mon, Jul 14, 2014 at 05:08:31PM +0200, Sam Ravnborg wrote:
> ucontext.h is already specified in include/uapi/asm-generic/Kbuild
> so this is redundant.
>
> Signed-off-by: Sam Ravnborg <[email protected]>
> Cc: Richard Kuo <[email protected]>
> Cc: linux-hexagon <[email protected]>
> Cc: David Howells <[email protected]>
> ---
> arch/hexagon/include/asm/Kbuild | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild
> index 0e69796..1ddcd97 100644
> --- a/arch/hexagon/include/asm/Kbuild
> +++ b/arch/hexagon/include/asm/Kbuild
> @@ -1,6 +1,3 @@
> -
> -header-y += ucontext.h
> -
> generic-y += auxvec.h
> generic-y += barrier.h
> generic-y += bug.h
> --
> 1.9.3
>
Acked-by: Richard Kuo <[email protected]>
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
On Mon, Jul 14, 2014 at 05:08:47PM +0200, Sam Ravnborg wrote:
> Remove redundant assignments.
>
> Signed-off-by: Sam Ravnborg <[email protected]>
> Cc: Richard Kuo <[email protected]>
> ---
> arch/hexagon/include/uapi/asm/Kbuild | 10 ----------
> 1 file changed, 10 deletions(-)
>
> diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild
> index c31706c..3f464d5 100644
> --- a/arch/hexagon/include/uapi/asm/Kbuild
> +++ b/arch/hexagon/include/uapi/asm/Kbuild
> @@ -1,15 +1,5 @@
> # UAPI Header export list
> include include/uapi/asm-generic/Kbuild.asm
>
> -header-y += bitsperlong.h
> -header-y += byteorder.h
> -header-y += kvm_para.h
> -header-y += param.h
> -header-y += ptrace.h
> header-y += registers.h
> -header-y += setup.h
> -header-y += sigcontext.h
> -header-y += signal.h
> -header-y += swab.h
> -header-y += unistd.h
> header-y += user.h
> --
> 1.9.3
>
Acked-by: Richard Kuo <[email protected]>
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation