Commit 7cbbbb8b authored by Masahiro Yamada's avatar Masahiro Yamada

kbuild: warn redundant generic-y

The generic-y is redundant under the following condition:

 - arch has its own implementation

 - the same header is added to generated-y

 - the same header is added to mandatory-y

If a redundant generic-y is found, the warning like follows is displayed:

  scripts/Makefile.asm-generic:20: redundant generic-y found in arch/arm/include/asm/Kbuild: timex.h

I fixed up arch Kbuild files found by this.
Suggested-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent f84dde10
...@@ -18,7 +18,6 @@ generic-y += segment.h ...@@ -18,7 +18,6 @@ generic-y += segment.h
generic-y += serial.h generic-y += serial.h
generic-y += simd.h generic-y += simd.h
generic-y += sizes.h generic-y += sizes.h
generic-y += timex.h
generic-y += trace_clock.h generic-y += trace_clock.h
generated-y += mach-types.h generated-y += mach-types.h
......
...@@ -17,7 +17,6 @@ generic-y += fb.h ...@@ -17,7 +17,6 @@ generic-y += fb.h
generic-y += ftrace.h generic-y += ftrace.h
generic-y += futex.h generic-y += futex.h
generic-y += hardirq.h generic-y += hardirq.h
generic-y += hash.h
generic-y += hw_irq.h generic-y += hw_irq.h
generic-y += irq_regs.h generic-y += irq_regs.h
generic-y += irq_work.h generic-y += irq_work.h
......
...@@ -2,4 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm ...@@ -2,4 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm
generated-y += unistd_64.h generated-y += unistd_64.h
generic-y += kvm_para.h generic-y += kvm_para.h
generic-y += socket.h
...@@ -15,7 +15,6 @@ generic-y += fb.h ...@@ -15,7 +15,6 @@ generic-y += fb.h
generic-y += ftrace.h generic-y += ftrace.h
generic-y += hardirq.h generic-y += hardirq.h
generic-y += hw_irq.h generic-y += hw_irq.h
generic-y += irq.h
generic-y += irq_regs.h generic-y += irq_regs.h
generic-y += irq_work.h generic-y += irq_work.h
generic-y += kdebug.h generic-y += kdebug.h
...@@ -35,7 +34,6 @@ generic-y += qrwlock.h ...@@ -35,7 +34,6 @@ generic-y += qrwlock.h
generic-y += sections.h generic-y += sections.h
generic-y += segment.h generic-y += segment.h
generic-y += shmparam.h generic-y += shmparam.h
generic-y += string.h
generic-y += switch_to.h generic-y += switch_to.h
generic-y += topology.h generic-y += topology.h
generic-y += trace_clock.h generic-y += trace_clock.h
......
generated-y += syscall_table_32.h generated-y += syscall_table_32.h
generated-y += syscall_table_64.h generated-y += syscall_table_64.h
generated-y += syscall_table_c32.h generated-y += syscall_table_c32.h
generic-y += barrier.h
generic-y += current.h generic-y += current.h
generic-y += device.h generic-y += device.h
generic-y += div64.h generic-y += div64.h
...@@ -20,7 +19,6 @@ generic-y += percpu.h ...@@ -20,7 +19,6 @@ generic-y += percpu.h
generic-y += preempt.h generic-y += preempt.h
generic-y += seccomp.h generic-y += seccomp.h
generic-y += segment.h generic-y += segment.h
generic-y += topology.h
generic-y += trace_clock.h generic-y += trace_clock.h
generic-y += user.h generic-y += user.h
generic-y += vga.h generic-y += vga.h
......
...@@ -5,7 +5,6 @@ generated-y += syscall_table_spu.h ...@@ -5,7 +5,6 @@ generated-y += syscall_table_spu.h
generic-y += div64.h generic-y += div64.h
generic-y += export.h generic-y += export.h
generic-y += irq_regs.h generic-y += irq_regs.h
generic-y += irq_work.h
generic-y += local64.h generic-y += local64.h
generic-y += mcs_spinlock.h generic-y += mcs_spinlock.h
generic-y += preempt.h generic-y += preempt.h
......
...@@ -20,7 +20,6 @@ generic-y += local.h ...@@ -20,7 +20,6 @@ generic-y += local.h
generic-y += local64.h generic-y += local64.h
generic-y += mcs_spinlock.h generic-y += mcs_spinlock.h
generic-y += mm-arch-hooks.h generic-y += mm-arch-hooks.h
generic-y += preempt.h
generic-y += rwsem.h generic-y += rwsem.h
generic-y += trace_clock.h generic-y += trace_clock.h
generic-y += unaligned.h generic-y += unaligned.h
......
...@@ -3,4 +3,3 @@ include include/uapi/asm-generic/Kbuild.asm ...@@ -3,4 +3,3 @@ include include/uapi/asm-generic/Kbuild.asm
generated-y += unistd_32.h generated-y += unistd_32.h
generated-y += unistd_64.h generated-y += unistd_64.h
generic-y += socket.h
...@@ -3,4 +3,3 @@ include include/uapi/asm-generic/Kbuild.asm ...@@ -3,4 +3,3 @@ include include/uapi/asm-generic/Kbuild.asm
generated-y += unistd_32.h generated-y += unistd_32.h
generated-y += unistd_64.h generated-y += unistd_64.h
generated-y += unistd_x32.h generated-y += unistd_x32.h
generic-y += socket.h
...@@ -15,7 +15,6 @@ generic-y += irq_work.h ...@@ -15,7 +15,6 @@ generic-y += irq_work.h
generic-y += kdebug.h generic-y += kdebug.h
generic-y += kmap_types.h generic-y += kmap_types.h
generic-y += kprobes.h generic-y += kprobes.h
generic-y += linkage.h
generic-y += local.h generic-y += local.h
generic-y += local64.h generic-y += local64.h
generic-y += mcs_spinlock.h generic-y += mcs_spinlock.h
......
...@@ -2,4 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm ...@@ -2,4 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm
generated-y += unistd_32.h generated-y += unistd_32.h
generic-y += kvm_para.h generic-y += kvm_para.h
generic-y += socket.h
...@@ -14,6 +14,12 @@ src := $(subst /generated,,$(obj)) ...@@ -14,6 +14,12 @@ src := $(subst /generated,,$(obj))
include scripts/Kbuild.include include scripts/Kbuild.include
redundant := $(filter $(mandatory-y) $(generated-y), $(generic-y))
redundant += $(foreach f, $(generic-y), $(if $(wildcard $(srctree)/$(src)/$(f)),$(f)))
redundant := $(sort $(redundant))
$(if $(redundant),\
$(warning redundant generic-y found in $(src)/Kbuild: $(redundant)))
# If arch does not implement mandatory headers, fallback to asm-generic ones. # If arch does not implement mandatory headers, fallback to asm-generic ones.
mandatory-y := $(filter-out $(generated-y), $(mandatory-y)) mandatory-y := $(filter-out $(generated-y), $(mandatory-y))
generic-y += $(foreach f, $(mandatory-y), $(if $(wildcard $(srctree)/$(src)/$(f)),,$(f))) generic-y += $(foreach f, $(mandatory-y), $(if $(wildcard $(srctree)/$(src)/$(f)),,$(f)))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment