diff mbox series

[10/16] local64.h: make <asm/local64.h> mandatory

Message ID 20201229231449.Abfir3q7f%akpm@linux-foundation.org (mailing list archive)
State New, archived
Headers show
Series [01/16] selftests/vm: fix building protection keys test | expand

Commit Message

Andrew Morton Dec. 29, 2020, 11:14 p.m. UTC 
From: Randy Dunlap <rdunlap@infradead.org>
Subject: local64.h: make <asm/local64.h> mandatory

Make <asm-generic/local64.h> mandatory in include/asm-generic/Kbuild and
remove all arch/*/include/asm/local64.h arch-specific files since they
only #include <asm-generic/local64.h>.

This fixes build errors on arch/c6x/ and arch/nios2/ for
block/blk-iocost.c.

Build-tested on 21 of 25 arch-es. (tools problems on the others)

Yes, we could even rename <asm-generic/local64.h> to
<linux/local64.h> and change all #includes to use
<linux/local64.h> instead.

Link: https://lkml.kernel.org/r/20201227024446.17018-1-rdunlap@infradead.org
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Suggested-by: Christoph Hellwig <hch@infradead.org>
Reviewed-by: Masahiro Yamada <masahiroy@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Aurelien Jacquiot <jacquiot.aurelien@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/alpha/include/asm/local64.h   |    1 -
 arch/arc/include/asm/Kbuild        |    1 -
 arch/arm/include/asm/Kbuild        |    1 -
 arch/arm64/include/asm/Kbuild      |    1 -
 arch/csky/include/asm/Kbuild       |    1 -
 arch/h8300/include/asm/Kbuild      |    1 -
 arch/hexagon/include/asm/Kbuild    |    1 -
 arch/ia64/include/asm/local64.h    |    1 -
 arch/m68k/include/asm/Kbuild       |    1 -
 arch/microblaze/include/asm/Kbuild |    1 -
 arch/mips/include/asm/Kbuild       |    1 -
 arch/nds32/include/asm/Kbuild      |    1 -
 arch/openrisc/include/asm/Kbuild   |    1 -
 arch/parisc/include/asm/Kbuild     |    1 -
 arch/powerpc/include/asm/Kbuild    |    1 -
 arch/riscv/include/asm/Kbuild      |    1 -
 arch/s390/include/asm/Kbuild       |    1 -
 arch/sh/include/asm/Kbuild         |    1 -
 arch/sparc/include/asm/Kbuild      |    1 -
 arch/x86/include/asm/local64.h     |    1 -
 arch/xtensa/include/asm/Kbuild     |    1 -
 include/asm-generic/Kbuild         |    1 +
 22 files changed, 1 insertion(+), 21 deletions(-)
diff mbox series

Patch

--- a/arch/alpha/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <asm-generic/local64.h>
--- a/arch/arc/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/arc/include/asm/Kbuild
@@ -1,7 +1,6 @@ 
 # SPDX-License-Identifier: GPL-2.0
 generic-y += extable.h
 generic-y += kvm_para.h
-generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += parport.h
 generic-y += user.h
--- a/arch/arm64/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/arm64/include/asm/Kbuild
@@ -1,6 +1,5 @@ 
 # SPDX-License-Identifier: GPL-2.0
 generic-y += early_ioremap.h
-generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += qrwlock.h
 generic-y += qspinlock.h
--- a/arch/arm/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/arm/include/asm/Kbuild
@@ -2,7 +2,6 @@ 
 generic-y += early_ioremap.h
 generic-y += extable.h
 generic-y += flat.h
-generic-y += local64.h
 generic-y += parport.h
 
 generated-y += mach-types.h
--- a/arch/csky/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/csky/include/asm/Kbuild
@@ -2,7 +2,6 @@ 
 generic-y += asm-offsets.h
 generic-y += gpio.h
 generic-y += kvm_para.h
-generic-y += local64.h
 generic-y += qrwlock.h
 generic-y += user.h
 generic-y += vmlinux.lds.h
--- a/arch/h8300/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/h8300/include/asm/Kbuild
@@ -2,7 +2,6 @@ 
 generic-y += asm-offsets.h
 generic-y += extable.h
 generic-y += kvm_para.h
-generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += parport.h
 generic-y += spinlock.h
--- a/arch/hexagon/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/hexagon/include/asm/Kbuild
@@ -2,5 +2,4 @@ 
 generic-y += extable.h
 generic-y += iomap.h
 generic-y += kvm_para.h
-generic-y += local64.h
 generic-y += mcs_spinlock.h
--- a/arch/ia64/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <asm-generic/local64.h>
--- a/arch/m68k/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/m68k/include/asm/Kbuild
@@ -2,6 +2,5 @@ 
 generated-y += syscall_table.h
 generic-y += extable.h
 generic-y += kvm_para.h
-generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += spinlock.h
--- a/arch/microblaze/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/microblaze/include/asm/Kbuild
@@ -2,7 +2,6 @@ 
 generated-y += syscall_table.h
 generic-y += extable.h
 generic-y += kvm_para.h
-generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += parport.h
 generic-y += syscalls.h
--- a/arch/mips/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/mips/include/asm/Kbuild
@@ -6,7 +6,6 @@  generated-y += syscall_table_64_n64.h
 generated-y += syscall_table_64_o32.h
 generic-y += export.h
 generic-y += kvm_para.h
-generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += parport.h
 generic-y += qrwlock.h
--- a/arch/nds32/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/nds32/include/asm/Kbuild
@@ -4,6 +4,5 @@  generic-y += cmpxchg.h
 generic-y += export.h
 generic-y += gpio.h
 generic-y += kvm_para.h
-generic-y += local64.h
 generic-y += parport.h
 generic-y += user.h
--- a/arch/openrisc/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/openrisc/include/asm/Kbuild
@@ -1,7 +1,6 @@ 
 # SPDX-License-Identifier: GPL-2.0
 generic-y += extable.h
 generic-y += kvm_para.h
-generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += qspinlock_types.h
 generic-y += qspinlock.h
--- a/arch/parisc/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/parisc/include/asm/Kbuild
@@ -3,6 +3,5 @@  generated-y += syscall_table_32.h
 generated-y += syscall_table_64.h
 generated-y += syscall_table_c32.h
 generic-y += kvm_para.h
-generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += user.h
--- a/arch/powerpc/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/powerpc/include/asm/Kbuild
@@ -5,7 +5,6 @@  generated-y += syscall_table_c32.h
 generated-y += syscall_table_spu.h
 generic-y += export.h
 generic-y += kvm_types.h
-generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += qrwlock.h
 generic-y += vtime.h
--- a/arch/riscv/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/riscv/include/asm/Kbuild
@@ -3,6 +3,5 @@  generic-y += early_ioremap.h
 generic-y += extable.h
 generic-y += flat.h
 generic-y += kvm_para.h
-generic-y += local64.h
 generic-y += user.h
 generic-y += vmlinux.lds.h
--- a/arch/s390/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/s390/include/asm/Kbuild
@@ -7,5 +7,4 @@  generated-y += unistd_nr.h
 generic-y += asm-offsets.h
 generic-y += export.h
 generic-y += kvm_types.h
-generic-y += local64.h
 generic-y += mcs_spinlock.h
--- a/arch/sh/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/sh/include/asm/Kbuild
@@ -1,6 +1,5 @@ 
 # SPDX-License-Identifier: GPL-2.0
 generated-y += syscall_table.h
 generic-y += kvm_para.h
-generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += parport.h
--- a/arch/sparc/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/sparc/include/asm/Kbuild
@@ -6,5 +6,4 @@  generated-y += syscall_table_64.h
 generated-y += syscall_table_c32.h
 generic-y += export.h
 generic-y += kvm_para.h
-generic-y += local64.h
 generic-y += mcs_spinlock.h
--- a/arch/x86/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <asm-generic/local64.h>
--- a/arch/xtensa/include/asm/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/arch/xtensa/include/asm/Kbuild
@@ -2,7 +2,6 @@ 
 generated-y += syscall_table.h
 generic-y += extable.h
 generic-y += kvm_para.h
-generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += param.h
 generic-y += qrwlock.h
--- a/include/asm-generic/Kbuild~local64h-make-asm-local64h-mandatory
+++ a/include/asm-generic/Kbuild
@@ -34,6 +34,7 @@  mandatory-y += kmap_size.h
 mandatory-y += kprobes.h
 mandatory-y += linkage.h
 mandatory-y += local.h
+mandatory-y += local64.h
 mandatory-y += mm-arch-hooks.h
 mandatory-y += mmiowb.h
 mandatory-y += mmu.h