History

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
  1. arch/alpha/include/asm/local64.h +0 −1
  2. arch/arc/include/asm/Kbuild +0 −1
  3. arch/arm/include/asm/Kbuild +0 −1
  4. arch/arm64/include/asm/Kbuild +0 −1
  5. arch/csky/include/asm/Kbuild +0 −1
  6. arch/h8300/include/asm/Kbuild +0 −1
  7. arch/hexagon/include/asm/Kbuild +0 −1
  8. arch/ia64/include/asm/local64.h +0 −1
  9. arch/m68k/include/asm/Kbuild +0 −1
  10. arch/microblaze/include/asm/Kbuild +0 −1
  11. arch/mips/include/asm/Kbuild +0 −1
  12. arch/nds32/include/asm/Kbuild +0 −1
  13. arch/openrisc/include/asm/Kbuild +0 −1
  14. arch/parisc/include/asm/Kbuild +0 −1
  15. arch/powerpc/include/asm/Kbuild +0 −1
  16. arch/riscv/include/asm/Kbuild +0 −1
  17. arch/s390/include/asm/Kbuild +0 −1
  18. arch/sh/include/asm/Kbuild +0 −1
  19. arch/sparc/include/asm/Kbuild +0 −1
  20. arch/x86/include/asm/local64.h +0 −1
  21. arch/xtensa/include/asm/Kbuild +0 −1
  22. 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 @@
11 # SPDX-License-Identifier: GPL-2.0
22 generic-y += extable.h
33 generic-y += kvm_para.h
4−generic-y += local64.h
54 generic-y += mcs_spinlock.h
65 generic-y += parport.h
76 generic-y += user.h
arch/arm/include/asm/Kbuild+0−1
@@ -2,7 +2,6 @@ · 1 unmodified line
22 generic-y += early_ioremap.h
33 generic-y += extable.h
44 generic-y += flat.h
5−generic-y += local64.h
65 generic-y += parport.h
76
87 generated-y += mach-types.h
arch/arm64/include/asm/Kbuild+0−1
@@ -1,6 +1,5 @@
11 # SPDX-License-Identifier: GPL-2.0
22 generic-y += early_ioremap.h
3−generic-y += local64.h
43 generic-y += mcs_spinlock.h
54 generic-y += qrwlock.h
65 generic-y += qspinlock.h
arch/csky/include/asm/Kbuild+0−1
@@ -2,7 +2,6 @@ · 1 unmodified line
22 generic-y += asm-offsets.h
33 generic-y += gpio.h
44 generic-y += kvm_para.h
5−generic-y += local64.h
65 generic-y += qrwlock.h
76 generic-y += user.h
87 generic-y += vmlinux.lds.h
arch/h8300/include/asm/Kbuild+0−1
@@ -2,7 +2,6 @@ · 1 unmodified line
22 generic-y += asm-offsets.h
33 generic-y += extable.h
44 generic-y += kvm_para.h
5−generic-y += local64.h
65 generic-y += mcs_spinlock.h
76 generic-y += parport.h
87 generic-y += spinlock.h
arch/hexagon/include/asm/Kbuild+0−1
@@ -2,5 +2,4 @@ · 1 unmodified line
22 generic-y += extable.h
33 generic-y += iomap.h
44 generic-y += kvm_para.h
5−generic-y += local64.h
65 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
22 generated-y += syscall_table.h
33 generic-y += extable.h
44 generic-y += kvm_para.h
5−generic-y += local64.h
65 generic-y += mcs_spinlock.h
76 generic-y += spinlock.h
arch/microblaze/include/asm/Kbuild+0−1
@@ -2,7 +2,6 @@ · 1 unmodified line
22 generated-y += syscall_table.h
33 generic-y += extable.h
44 generic-y += kvm_para.h
5−generic-y += local64.h
65 generic-y += mcs_spinlock.h
76 generic-y += parport.h
87 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
66 generated-y += syscall_table_64_o32.h
77 generic-y += export.h
88 generic-y += kvm_para.h
9−generic-y += local64.h
109 generic-y += mcs_spinlock.h
1110 generic-y += parport.h
1211 generic-y += qrwlock.h
arch/nds32/include/asm/Kbuild+0−1
@@ -4,6 +4,5 @@ generic-y += cmpxchg.h · 3 unmodified lines
44 generic-y += export.h
55 generic-y += gpio.h
66 generic-y += kvm_para.h
7−generic-y += local64.h
87 generic-y += parport.h
98 generic-y += user.h
arch/openrisc/include/asm/Kbuild+0−1
@@ -1,7 +1,6 @@
11 # SPDX-License-Identifier: GPL-2.0
22 generic-y += extable.h
33 generic-y += kvm_para.h
4−generic-y += local64.h
54 generic-y += mcs_spinlock.h
65 generic-y += qspinlock_types.h
76 generic-y += qspinlock.h
arch/parisc/include/asm/Kbuild+0−1
@@ -3,6 +3,5 @@ generated-y += syscall_table_32.h · 2 unmodified lines
33 generated-y += syscall_table_64.h
44 generated-y += syscall_table_c32.h
55 generic-y += kvm_para.h
6−generic-y += local64.h
76 generic-y += mcs_spinlock.h
87 generic-y += user.h
arch/powerpc/include/asm/Kbuild+0−1
@@ -5,7 +5,6 @@ generated-y += syscall_table_c32.h · 4 unmodified lines
55 generated-y += syscall_table_spu.h
66 generic-y += export.h
77 generic-y += kvm_types.h
8−generic-y += local64.h
98 generic-y += mcs_spinlock.h
109 generic-y += qrwlock.h
1110 generic-y += vtime.h
arch/riscv/include/asm/Kbuild+0−1
@@ -3,6 +3,5 @@ generic-y += early_ioremap.h · 2 unmodified lines
33 generic-y += extable.h
44 generic-y += flat.h
55 generic-y += kvm_para.h
6−generic-y += local64.h
76 generic-y += user.h
87 generic-y += vmlinux.lds.h
arch/s390/include/asm/Kbuild+0−1
@@ -7,5 +7,4 @@ generated-y += unistd_nr.h · 6 unmodified lines
77 generic-y += asm-offsets.h
88 generic-y += export.h
99 generic-y += kvm_types.h
10−generic-y += local64.h
1110 generic-y += mcs_spinlock.h
arch/sh/include/asm/Kbuild+0−1
@@ -1,6 +1,5 @@
11 # SPDX-License-Identifier: GPL-2.0
22 generated-y += syscall_table.h
33 generic-y += kvm_para.h
4−generic-y += local64.h
54 generic-y += mcs_spinlock.h
65 generic-y += parport.h
arch/sparc/include/asm/Kbuild+0−1
@@ -6,5 +6,4 @@ generated-y += syscall_table_64.h · 5 unmodified lines
66 generated-y += syscall_table_c32.h
77 generic-y += export.h
88 generic-y += kvm_para.h
9−generic-y += local64.h
109 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
22 generated-y += syscall_table.h
33 generic-y += extable.h
44 generic-y += kvm_para.h
5−generic-y += local64.h
65 generic-y += mcs_spinlock.h
76 generic-y += param.h
87 generic-y += qrwlock.h
include/asm-generic/Kbuild+1−0
@@ -34,6 +34,7 @@ mandatory-y += kmap_size.h · 33 unmodified lines
3434 mandatory-y += kprobes.h
3535 mandatory-y += linkage.h
3636 mandatory-y += local.h
37+mandatory-y += local64.h
3738 mandatory-y += mm-arch-hooks.h
3839 mandatory-y += mmiowb.h
3940 mandatory-y += mmu.h