Commit 630f289b authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Linus Torvalds
Browse files

asm-generic: make more kernel-space headers mandatory 



Change a header to mandatory-y if both of the following are met:

[1] At least one architecture (except um) specifies it as generic-y in
    arch/*/include/asm/Kbuild

[2] Every architecture (except um) either has its own implementation
    (arch/*/include/asm/*.h) or specifies it as generic-y in
    arch/*/include/asm/Kbuild

This commit was generated by the following shell script.

----------------------------------->8-----------------------------------

arches=$(cd arch; ls -1 | sed -e '/Kconfig/d' -e '/um/d')

tmpfile=$(mktemp)

grep "^mandatory-y +=" include/asm-generic/Kbuild > $tmpfile

find arch -path 'arch/*/include/asm/Kbuild' |
	xargs sed -n 's/^generic-y += \(.*\)/\1/p' | sort -u |
while read header
do
	mandatory=yes

	for arch in $arches
	do
		if ! grep -q "generic-y += $header" arch/$arch/include/asm/Kbuild &&
			! [ -f arch/$arch/include/asm/$header ]; then
			mandatory=no
			break
		fi
	done

	if [ "$mandatory" = yes ]; then
		echo "mandatory-y += $header" >> $tmpfile

		for arch in $arches
		do
			sed -i "/generic-y += $header/d" arch/$arch/include/asm/Kbuild
		done
	fi

done

sed -i '/^mandatory-y +=/d' include/asm-generic/Kbuild

LANG=C sort $tmpfile >> include/asm-generic/Kbuild

----------------------------------->8-----------------------------------

One obvious benefit is the diff stat:

 25 files changed, 52 insertions(+), 557 deletions(-)

It is tedious to list generic-y for each arch that needs it.

So, mandatory-y works like a fallback default (by just wrapping
asm-generic one) when arch does not have a specific header
implementation.

See the following commits:

def3f7ce
a1b39bae

It is tedious to convert headers one by one, so I processed by a shell
script.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Link: http://lkml.kernel.org/r/20200210175452.5030-1-masahiroy@kernel.org


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 98c985d7

arch/alpha/include/asm/Kbuild

+0 −11
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



generated-y += syscall_table.h

generic-y += compat.h

generic-y += exec.h

generic-y += export.h

generic-y += fb.h

generic-y += irq_work.h

generic-y += kvm_para.h

generic-y += mcs_spinlock.h
 
generic-y += mm-arch-hooks.h

generic-y += mmiowb.h

generic-y += preempt.h

generic-y += sections.h

generic-y += trace_clock.h

generic-y += current.h

generic-y += kprobes.h

arch/arc/include/asm/Kbuild

+0 −21
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

generic-y += bugs.h

generic-y += compat.h

generic-y += device.h

generic-y += div64.h

generic-y += dma-mapping.h

generic-y += emergency-restart.h

generic-y += extable.h

generic-y += ftrace.h

generic-y += hardirq.h

generic-y += hw_irq.h

generic-y += irq_regs.h

generic-y += irq_work.h

generic-y += kvm_para.h

generic-y += local.h

generic-y += local64.h

generic-y += mcs_spinlock.h

generic-y += mm-arch-hooks.h

generic-y += mmiowb.h

generic-y += parport.h

generic-y += percpu.h

generic-y += preempt.h

generic-y += topology.h

generic-y += trace_clock.h

generic-y += user.h
 
generic-y += vga.h

generic-y += word-at-a-time.h

generic-y += xor.h

arch/arm/include/asm/Kbuild

+0 −12
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

generic-y += compat.h

generic-y += current.h

generic-y += early_ioremap.h

generic-y += emergency-restart.h

generic-y += exec.h

generic-y += extable.h

generic-y += flat.h

generic-y += irq_regs.h

generic-y += kdebug.h

generic-y += local.h

generic-y += local64.h

generic-y += mm-arch-hooks.h

generic-y += mmiowb.h

generic-y += parport.h

generic-y += preempt.h

generic-y += seccomp.h

generic-y += serial.h

generic-y += trace_clock.h



generated-y += mach-types.h

generated-y += unistd-nr.h

arch/arm64/include/asm/Kbuild

+0 −18
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

generic-y += bugs.h

generic-y += delay.h

generic-y += div64.h

generic-y += dma.h

generic-y += dma-mapping.h

generic-y += early_ioremap.h

generic-y += emergency-restart.h

generic-y += hw_irq.h

generic-y += irq_regs.h

generic-y += kdebug.h

generic-y += kmap_types.h

generic-y += local.h

generic-y += local64.h

generic-y += mcs_spinlock.h

generic-y += mm-arch-hooks.h

generic-y += mmiowb.h

generic-y += qrwlock.h

generic-y += qspinlock.h

generic-y += serial.h

generic-y += set_memory.h

generic-y += switch_to.h

generic-y += trace_clock.h

generic-y += unaligned.h

generic-y += user.h
 
generic-y += vga.h

arch/c6x/include/asm/Kbuild

+0 −37
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

generic-y += atomic.h

generic-y += barrier.h

generic-y += bugs.h

generic-y += compat.h

generic-y += current.h

generic-y += device.h

generic-y += div64.h

generic-y += dma.h

generic-y += dma-mapping.h

generic-y += emergency-restart.h

generic-y += exec.h

generic-y += extable.h

generic-y += fb.h

generic-y += futex.h

generic-y += hw_irq.h

generic-y += io.h

generic-y += irq_regs.h

generic-y += irq_work.h

generic-y += kdebug.h

generic-y += kmap_types.h

generic-y += kprobes.h

generic-y += kvm_para.h

generic-y += local.h

generic-y += mcs_spinlock.h

generic-y += mm-arch-hooks.h

generic-y += mmiowb.h

generic-y += mmu.h

generic-y += mmu_context.h

generic-y += pci.h

generic-y += percpu.h

generic-y += pgalloc.h

generic-y += preempt.h

generic-y += serial.h

generic-y += shmparam.h

generic-y += tlbflush.h

generic-y += topology.h

generic-y += trace_clock.h

generic-y += user.h
 
generic-y += vga.h

generic-y += word-at-a-time.h

generic-y += xor.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE