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.

Randy Dunlap committed 5 years ago

Commit 87dbc201 parent 13384f622 files · +1 −21Browse files

Unified · Split

22 files

arch/alpha/include/asm/local64.h +0 −1
arch/arc/include/asm/Kbuild +0 −1
arch/arm/include/asm/Kbuild +0 −1
arch/arm64/include/asm/Kbuild +0 −1
arch/csky/include/asm/Kbuild +0 −1
arch/h8300/include/asm/Kbuild +0 −1
arch/hexagon/include/asm/Kbuild +0 −1
arch/ia64/include/asm/local64.h +0 −1
arch/m68k/include/asm/Kbuild +0 −1
arch/microblaze/include/asm/Kbuild +0 −1
arch/mips/include/asm/Kbuild +0 −1
arch/nds32/include/asm/Kbuild +0 −1
arch/openrisc/include/asm/Kbuild +0 −1
arch/parisc/include/asm/Kbuild +0 −1
arch/powerpc/include/asm/Kbuild +0 −1
arch/riscv/include/asm/Kbuild +0 −1
arch/s390/include/asm/Kbuild +0 −1
arch/sh/include/asm/Kbuild +0 −1
arch/sparc/include/asm/Kbuild +0 −1
arch/x86/include/asm/local64.h +0 −1
arch/xtensa/include/asm/Kbuild +0 −1
include/asm-generic/Kbuild +1 −0

arch/alpha/include/asm/local64.h+0−1

@@ -1 +0,0 @@
1	#include <asm-generic/local64.h>

arch/arc/include/asm/Kbuild+0−1

@@ -1,7 +1,6 @@
1	# SPDX-License-Identifier: GPL-2.0	1	# SPDX-License-Identifier: GPL-2.0
2	generic-y += extable.h	2	generic-y += extable.h
3	generic-y += kvm_para.h	3	generic-y += kvm_para.h
4	generic-y += local64.h
5	generic-y += mcs_spinlock.h	4	generic-y += mcs_spinlock.h
6	generic-y += parport.h	5	generic-y += parport.h
7	generic-y += user.h	6	generic-y += user.h

arch/arm/include/asm/Kbuild+0−1

@@ -2,7 +2,6 @@ · 1 unmodified line
2	generic-y += early_ioremap.h	2	generic-y += early_ioremap.h
3	generic-y += extable.h	3	generic-y += extable.h
4	generic-y += flat.h	4	generic-y += flat.h
5	generic-y += local64.h
6	generic-y += parport.h	5	generic-y += parport.h
7		6
8	generated-y += mach-types.h	7	generated-y += mach-types.h

arch/arm64/include/asm/Kbuild+0−1

@@ -1,6 +1,5 @@
1	# SPDX-License-Identifier: GPL-2.0	1	# SPDX-License-Identifier: GPL-2.0
2	generic-y += early_ioremap.h	2	generic-y += early_ioremap.h
3	generic-y += local64.h
4	generic-y += mcs_spinlock.h	3	generic-y += mcs_spinlock.h
5	generic-y += qrwlock.h	4	generic-y += qrwlock.h
6	generic-y += qspinlock.h	5	generic-y += qspinlock.h

arch/csky/include/asm/Kbuild+0−1

@@ -2,7 +2,6 @@ · 1 unmodified line
2	generic-y += asm-offsets.h	2	generic-y += asm-offsets.h
3	generic-y += gpio.h	3	generic-y += gpio.h
4	generic-y += kvm_para.h	4	generic-y += kvm_para.h
5	generic-y += local64.h
6	generic-y += qrwlock.h	5	generic-y += qrwlock.h
7	generic-y += user.h	6	generic-y += user.h
8	generic-y += vmlinux.lds.h	7	generic-y += vmlinux.lds.h

arch/h8300/include/asm/Kbuild+0−1

@@ -2,7 +2,6 @@ · 1 unmodified line
2	generic-y += asm-offsets.h	2	generic-y += asm-offsets.h
3	generic-y += extable.h	3	generic-y += extable.h
4	generic-y += kvm_para.h	4	generic-y += kvm_para.h
5	generic-y += local64.h
6	generic-y += mcs_spinlock.h	5	generic-y += mcs_spinlock.h
7	generic-y += parport.h	6	generic-y += parport.h
8	generic-y += spinlock.h	7	generic-y += spinlock.h

arch/hexagon/include/asm/Kbuild+0−1

@@ -2,5 +2,4 @@ · 1 unmodified line
2	generic-y += extable.h	2	generic-y += extable.h
3	generic-y += iomap.h	3	generic-y += iomap.h
4	generic-y += kvm_para.h	4	generic-y += kvm_para.h
5	generic-y += local64.h
6	generic-y += mcs_spinlock.h	5	generic-y += mcs_spinlock.h

arch/ia64/include/asm/local64.h+0−1

@@ -1 +0,0 @@
1	#include <asm-generic/local64.h>

arch/m68k/include/asm/Kbuild+0−1

@@ -2,6 +2,5 @@ · 1 unmodified line
2	generated-y += syscall_table.h	2	generated-y += syscall_table.h
3	generic-y += extable.h	3	generic-y += extable.h
4	generic-y += kvm_para.h	4	generic-y += kvm_para.h
5	generic-y += local64.h
6	generic-y += mcs_spinlock.h	5	generic-y += mcs_spinlock.h
7	generic-y += spinlock.h	6	generic-y += spinlock.h

arch/microblaze/include/asm/Kbuild+0−1

@@ -2,7 +2,6 @@ · 1 unmodified line
2	generated-y += syscall_table.h	2	generated-y += syscall_table.h
3	generic-y += extable.h	3	generic-y += extable.h
4	generic-y += kvm_para.h	4	generic-y += kvm_para.h
5	generic-y += local64.h
6	generic-y += mcs_spinlock.h	5	generic-y += mcs_spinlock.h
7	generic-y += parport.h	6	generic-y += parport.h
8	generic-y += syscalls.h	7	generic-y += syscalls.h

arch/mips/include/asm/Kbuild+0−1

@@ -6,7 +6,6 @@ generated-y += syscall_table_64_n64.h · 5 unmodified lines
6	generated-y += syscall_table_64_o32.h	6	generated-y += syscall_table_64_o32.h
7	generic-y += export.h	7	generic-y += export.h
8	generic-y += kvm_para.h	8	generic-y += kvm_para.h
9	generic-y += local64.h
10	generic-y += mcs_spinlock.h	9	generic-y += mcs_spinlock.h
11	generic-y += parport.h	10	generic-y += parport.h
12	generic-y += qrwlock.h	11	generic-y += qrwlock.h

arch/nds32/include/asm/Kbuild+0−1

@@ -4,6 +4,5 @@ generic-y += cmpxchg.h · 3 unmodified lines
4	generic-y += export.h	4	generic-y += export.h
5	generic-y += gpio.h	5	generic-y += gpio.h
6	generic-y += kvm_para.h	6	generic-y += kvm_para.h
7	generic-y += local64.h
8	generic-y += parport.h	7	generic-y += parport.h
9	generic-y += user.h	8	generic-y += user.h

arch/openrisc/include/asm/Kbuild+0−1

@@ -1,7 +1,6 @@
1	# SPDX-License-Identifier: GPL-2.0	1	# SPDX-License-Identifier: GPL-2.0
2	generic-y += extable.h	2	generic-y += extable.h
3	generic-y += kvm_para.h	3	generic-y += kvm_para.h
4	generic-y += local64.h
5	generic-y += mcs_spinlock.h	4	generic-y += mcs_spinlock.h
6	generic-y += qspinlock_types.h	5	generic-y += qspinlock_types.h
7	generic-y += qspinlock.h	6	generic-y += qspinlock.h

arch/parisc/include/asm/Kbuild+0−1

@@ -3,6 +3,5 @@ generated-y += syscall_table_32.h · 2 unmodified lines
3	generated-y += syscall_table_64.h	3	generated-y += syscall_table_64.h
4	generated-y += syscall_table_c32.h	4	generated-y += syscall_table_c32.h
5	generic-y += kvm_para.h	5	generic-y += kvm_para.h
6	generic-y += local64.h
7	generic-y += mcs_spinlock.h	6	generic-y += mcs_spinlock.h
8	generic-y += user.h	7	generic-y += user.h

arch/powerpc/include/asm/Kbuild+0−1

@@ -5,7 +5,6 @@ generated-y += syscall_table_c32.h · 4 unmodified lines
5	generated-y += syscall_table_spu.h	5	generated-y += syscall_table_spu.h
6	generic-y += export.h	6	generic-y += export.h
7	generic-y += kvm_types.h	7	generic-y += kvm_types.h
8	generic-y += local64.h
9	generic-y += mcs_spinlock.h	8	generic-y += mcs_spinlock.h
10	generic-y += qrwlock.h	9	generic-y += qrwlock.h
11	generic-y += vtime.h	10	generic-y += vtime.h

arch/riscv/include/asm/Kbuild+0−1

@@ -3,6 +3,5 @@ generic-y += early_ioremap.h · 2 unmodified lines
3	generic-y += extable.h	3	generic-y += extable.h
4	generic-y += flat.h	4	generic-y += flat.h
5	generic-y += kvm_para.h	5	generic-y += kvm_para.h
6	generic-y += local64.h
7	generic-y += user.h	6	generic-y += user.h
8	generic-y += vmlinux.lds.h	7	generic-y += vmlinux.lds.h

arch/s390/include/asm/Kbuild+0−1

@@ -7,5 +7,4 @@ generated-y += unistd_nr.h · 6 unmodified lines
7	generic-y += asm-offsets.h	7	generic-y += asm-offsets.h
8	generic-y += export.h	8	generic-y += export.h
9	generic-y += kvm_types.h	9	generic-y += kvm_types.h
10	generic-y += local64.h
11	generic-y += mcs_spinlock.h	10	generic-y += mcs_spinlock.h

arch/sh/include/asm/Kbuild+0−1

@@ -1,6 +1,5 @@
1	# SPDX-License-Identifier: GPL-2.0	1	# SPDX-License-Identifier: GPL-2.0
2	generated-y += syscall_table.h	2	generated-y += syscall_table.h
3	generic-y += kvm_para.h	3	generic-y += kvm_para.h
4	generic-y += local64.h
5	generic-y += mcs_spinlock.h	4	generic-y += mcs_spinlock.h
6	generic-y += parport.h	5	generic-y += parport.h

arch/sparc/include/asm/Kbuild+0−1

@@ -6,5 +6,4 @@ generated-y += syscall_table_64.h · 5 unmodified lines
6	generated-y += syscall_table_c32.h	6	generated-y += syscall_table_c32.h
7	generic-y += export.h	7	generic-y += export.h
8	generic-y += kvm_para.h	8	generic-y += kvm_para.h
9	generic-y += local64.h
10	generic-y += mcs_spinlock.h	9	generic-y += mcs_spinlock.h

arch/x86/include/asm/local64.h+0−1

@@ -1 +0,0 @@
1	#include <asm-generic/local64.h>

arch/xtensa/include/asm/Kbuild+0−1

@@ -2,7 +2,6 @@ · 1 unmodified line
2	generated-y += syscall_table.h	2	generated-y += syscall_table.h
3	generic-y += extable.h	3	generic-y += extable.h
4	generic-y += kvm_para.h	4	generic-y += kvm_para.h
5	generic-y += local64.h
6	generic-y += mcs_spinlock.h	5	generic-y += mcs_spinlock.h
7	generic-y += param.h	6	generic-y += param.h
8	generic-y += qrwlock.h	7	generic-y += qrwlock.h

include/asm-generic/Kbuild+1−0

@@ -34,6 +34,7 @@ mandatory-y += kmap_size.h · 33 unmodified lines
34	mandatory-y += kprobes.h	34	mandatory-y += kprobes.h
35	mandatory-y += linkage.h	35	mandatory-y += linkage.h
36	mandatory-y += local.h	36	mandatory-y += local.h
		37	mandatory-y += local64.h
37	mandatory-y += mm-arch-hooks.h	38	mandatory-y += mm-arch-hooks.h
38	mandatory-y += mmiowb.h	39	mandatory-y += mmiowb.h
39	mandatory-y += mmu.h	40	mandatory-y += mmu.h