Skip to content

Commit 7cbbbb8

Browse files
masahir0ymasahir0y
committed
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: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
1 parent f84dde1 commit 7cbbbb8

File tree

12 files changed

+6
-13
lines changed

12 files changed

+6
-13
lines changed

‎arch/arm/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ generic-y += segment.h
1818
generic-y += serial.h
1919
generic-y += simd.h
2020
generic-y += sizes.h
21-
generic-y += timex.h
2221
generic-y += trace_clock.h
2322

2423
generated-y += mach-types.h

‎arch/h8300/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ generic-y += fb.h
1717
generic-y += ftrace.h
1818
generic-y += futex.h
1919
generic-y += hardirq.h
20-
generic-y += hash.h
2120
generic-y += hw_irq.h
2221
generic-y += irq_regs.h
2322
generic-y += irq_work.h

‎arch/ia64/include/uapi/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm
22

33
generated-y += unistd_64.h
44
generic-y += kvm_para.h
5-
generic-y += socket.h

‎arch/openrisc/include/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ generic-y += fb.h
1515
generic-y += ftrace.h
1616
generic-y += hardirq.h
1717
generic-y += hw_irq.h
18-
generic-y += irq.h
1918
generic-y += irq_regs.h
2019
generic-y += irq_work.h
2120
generic-y += kdebug.h
@@ -35,7 +34,6 @@ generic-y += qrwlock.h
3534
generic-y += sections.h
3635
generic-y += segment.h
3736
generic-y += shmparam.h
38-
generic-y += string.h
3937
generic-y += switch_to.h
4038
generic-y += topology.h
4139
generic-y += trace_clock.h

‎arch/parisc/include/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
generated-y += syscall_table_32.h
22
generated-y += syscall_table_64.h
33
generated-y += syscall_table_c32.h
4-
generic-y += barrier.h
54
generic-y += current.h
65
generic-y += device.h
76
generic-y += div64.h
@@ -20,7 +19,6 @@ generic-y += percpu.h
2019
generic-y += preempt.h
2120
generic-y += seccomp.h
2221
generic-y += segment.h
23-
generic-y += topology.h
2422
generic-y += trace_clock.h
2523
generic-y += user.h
2624
generic-y += vga.h

‎arch/powerpc/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ generated-y += syscall_table_spu.h
55
generic-y += div64.h
66
generic-y += export.h
77
generic-y += irq_regs.h
8-
generic-y += irq_work.h
98
generic-y += local64.h
109
generic-y += mcs_spinlock.h
1110
generic-y += preempt.h

‎arch/s390/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ generic-y += local.h
2020
generic-y += local64.h
2121
generic-y += mcs_spinlock.h
2222
generic-y += mm-arch-hooks.h
23-
generic-y += preempt.h
2423
generic-y += rwsem.h
2524
generic-y += trace_clock.h
2625
generic-y += unaligned.h

‎arch/s390/include/uapi/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ include include/uapi/asm-generic/Kbuild.asm
33

44
generated-y += unistd_32.h
55
generated-y += unistd_64.h
6-
generic-y += socket.h

‎arch/x86/include/uapi/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ include include/uapi/asm-generic/Kbuild.asm
33
generated-y += unistd_32.h
44
generated-y += unistd_64.h
55
generated-y += unistd_x32.h
6-
generic-y += socket.h

‎arch/xtensa/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ generic-y += irq_work.h
1515
generic-y += kdebug.h
1616
generic-y += kmap_types.h
1717
generic-y += kprobes.h
18-
generic-y += linkage.h
1918
generic-y += local.h
2019
generic-y += local64.h
2120
generic-y += mcs_spinlock.h

‎arch/xtensa/include/uapi/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm
22

33
generated-y += unistd_32.h
44
generic-y += kvm_para.h
5-
generic-y += socket.h

‎scripts/Makefile.asm-generic

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ src := $(subst /generated,,$(obj))
1414

1515
include scripts/Kbuild.include
1616

17+
redundant := $(filter $(mandatory-y) $(generated-y), $(generic-y))
18+
redundant += $(foreach f, $(generic-y), $(if $(wildcard $(srctree)/$(src)/$(f)),$(f)))
19+
redundant := $(sort $(redundant))
20+
$(if $(redundant),\
21+
$(warning redundant generic-y found in $(src)/Kbuild: $(redundant)))
22+
1723
# If arch does not implement mandatory headers, fallback to asm-generic ones.
1824
mandatory-y := $(filter-out $(generated-y), $(mandatory-y))
1925
generic-y += $(foreach f, $(mandatory-y), $(if $(wildcard $(srctree)/$(src)/$(f)),,$(f)))

0 commit comments

Comments
 (0)