History

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.

Masahiro Yamada committed 7 years ago

Commit 7cbbbb81 parent f84dde112 files · +6 −13Browse files

Unified · Split

12 files
  1. arch/arm/include/asm/Kbuild +0 −1
  2. arch/h8300/include/asm/Kbuild +0 −1
  3. arch/ia64/include/uapi/asm/Kbuild +0 −1
  4. arch/openrisc/include/asm/Kbuild +0 −2
  5. arch/parisc/include/asm/Kbuild +0 −2
  6. arch/powerpc/include/asm/Kbuild +0 −1
  7. arch/s390/include/asm/Kbuild +0 −1
  8. arch/s390/include/uapi/asm/Kbuild +0 −1
  9. arch/x86/include/uapi/asm/Kbuild +0 −1
  10. arch/xtensa/include/asm/Kbuild +0 −1
  11. arch/xtensa/include/uapi/asm/Kbuild +0 −1
  12. scripts/Makefile.asm-generic +6 −0
arch/arm/include/asm/Kbuild+0−1
@@ -18,7 +18,6 @@ generic-y += segment.h · 17 unmodified lines
18generic-y += serial.h18generic-y += serial.h
19generic-y += simd.h19generic-y += simd.h
20generic-y += sizes.h20generic-y += sizes.h
21generic-y += timex.h
22generic-y += trace_clock.h21generic-y += trace_clock.h
23 22
24generated-y += mach-types.h23generated-y += mach-types.h
arch/h8300/include/asm/Kbuild+0−1
@@ -17,7 +17,6 @@ generic-y += fb.h · 16 unmodified lines
17generic-y += ftrace.h17generic-y += ftrace.h
18generic-y += futex.h18generic-y += futex.h
19generic-y += hardirq.h19generic-y += hardirq.h
20generic-y += hash.h
21generic-y += hw_irq.h20generic-y += hw_irq.h
22generic-y += irq_regs.h21generic-y += irq_regs.h
23generic-y += irq_work.h22generic-y += irq_work.h
arch/ia64/include/uapi/asm/Kbuild+0−1
@@ -2,4 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm · 1 unmodified line
2 2
3generated-y += unistd_64.h3generated-y += unistd_64.h
4generic-y += kvm_para.h4generic-y += kvm_para.h
5generic-y += socket.h
arch/openrisc/include/asm/Kbuild+0−2
@@ -15,7 +15,6 @@ generic-y += fb.h · 14 unmodified lines
15generic-y += ftrace.h15generic-y += ftrace.h
16generic-y += hardirq.h16generic-y += hardirq.h
17generic-y += hw_irq.h17generic-y += hw_irq.h
18generic-y += irq.h
19generic-y += irq_regs.h18generic-y += irq_regs.h
20generic-y += irq_work.h19generic-y += irq_work.h
21generic-y += kdebug.h20generic-y += kdebug.h
@@ -35,7 +34,6 @@ generic-y += qrwlock.h · 13 unmodified lines
35generic-y += sections.h34generic-y += sections.h
36generic-y += segment.h35generic-y += segment.h
37generic-y += shmparam.h36generic-y += shmparam.h
38generic-y += string.h
39generic-y += switch_to.h37generic-y += switch_to.h
40generic-y += topology.h38generic-y += topology.h
41generic-y += trace_clock.h39generic-y += trace_clock.h
arch/parisc/include/asm/Kbuild+0−2
@@ -1,7 +1,6 @@
1generated-y += syscall_table_32.h1generated-y += syscall_table_32.h
2generated-y += syscall_table_64.h2generated-y += syscall_table_64.h
3generated-y += syscall_table_c32.h3generated-y += syscall_table_c32.h
4generic-y += barrier.h
5generic-y += current.h4generic-y += current.h
6generic-y += device.h5generic-y += device.h
7generic-y += div64.h6generic-y += div64.h
@@ -20,7 +19,6 @@ generic-y += percpu.h · 12 unmodified lines
20generic-y += preempt.h19generic-y += preempt.h
21generic-y += seccomp.h20generic-y += seccomp.h
22generic-y += segment.h21generic-y += segment.h
23generic-y += topology.h
24generic-y += trace_clock.h22generic-y += trace_clock.h
25generic-y += user.h23generic-y += user.h
26generic-y += vga.h24generic-y += vga.h
arch/powerpc/include/asm/Kbuild+0−1
@@ -5,7 +5,6 @@ generated-y += syscall_table_spu.h · 4 unmodified lines
5generic-y += div64.h5generic-y += div64.h
6generic-y += export.h6generic-y += export.h
7generic-y += irq_regs.h7generic-y += irq_regs.h
8generic-y += irq_work.h
9generic-y += local64.h8generic-y += local64.h
10generic-y += mcs_spinlock.h9generic-y += mcs_spinlock.h
11generic-y += preempt.h10generic-y += preempt.h
arch/s390/include/asm/Kbuild+0−1
@@ -20,7 +20,6 @@ generic-y += local.h · 19 unmodified lines
20generic-y += local64.h20generic-y += local64.h
21generic-y += mcs_spinlock.h21generic-y += mcs_spinlock.h
22generic-y += mm-arch-hooks.h22generic-y += mm-arch-hooks.h
23generic-y += preempt.h
24generic-y += rwsem.h23generic-y += rwsem.h
25generic-y += trace_clock.h24generic-y += trace_clock.h
26generic-y += unaligned.h25generic-y += unaligned.h
arch/s390/include/uapi/asm/Kbuild+0−1
@@ -3,4 +3,3 @@ include include/uapi/asm-generic/Kbuild.asm · 2 unmodified lines
3 3
4generated-y += unistd_32.h4generated-y += unistd_32.h
5generated-y += unistd_64.h5generated-y += unistd_64.h
6generic-y += socket.h
arch/x86/include/uapi/asm/Kbuild+0−1
@@ -3,4 +3,3 @@ include include/uapi/asm-generic/Kbuild.asm · 2 unmodified lines
3generated-y += unistd_32.h3generated-y += unistd_32.h
4generated-y += unistd_64.h4generated-y += unistd_64.h
5generated-y += unistd_x32.h5generated-y += unistd_x32.h
6generic-y += socket.h
arch/xtensa/include/asm/Kbuild+0−1
@@ -15,7 +15,6 @@ generic-y += irq_work.h · 14 unmodified lines
15generic-y += kdebug.h15generic-y += kdebug.h
16generic-y += kmap_types.h16generic-y += kmap_types.h
17generic-y += kprobes.h17generic-y += kprobes.h
18generic-y += linkage.h
19generic-y += local.h18generic-y += local.h
20generic-y += local64.h19generic-y += local64.h
21generic-y += mcs_spinlock.h20generic-y += mcs_spinlock.h
arch/xtensa/include/uapi/asm/Kbuild+0−1
@@ -2,4 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm · 1 unmodified line
2 2
3generated-y += unistd_32.h3generated-y += unistd_32.h
4generic-y += kvm_para.h4generic-y += kvm_para.h
5generic-y += socket.h
scripts/Makefile.asm-generic+6−0
@@ -14,6 +14,12 @@ src := $(subst /generated,,$(obj)) · 13 unmodified lines
14 14
15include scripts/Kbuild.include15include scripts/Kbuild.include
16 16
17redundant := $(filter $(mandatory-y) $(generated-y), $(generic-y))
18redundant += $(foreach f, $(generic-y), $(if $(wildcard $(srctree)/$(src)/$(f)),$(f)))
19redundant := $(sort $(redundant))
20$(if $(redundant),\
21 $(warning redundant generic-y found in $(src)/Kbuild: $(redundant)))
22
17# If arch does not implement mandatory headers, fallback to asm-generic ones.23# If arch does not implement mandatory headers, fallback to asm-generic ones.
18mandatory-y := $(filter-out $(generated-y), $(mandatory-y))24mandatory-y := $(filter-out $(generated-y), $(mandatory-y))
19generic-y += $(foreach f, $(mandatory-y), $(if $(wildcard $(srctree)/$(src)/$(f)),,$(f)))25generic-y += $(foreach f, $(mandatory-y), $(if $(wildcard $(srctree)/$(src)/$(f)),,$(f)))