asm-generic: Make dma-contiguous.h a mandatory include/asm header

dma-continuguous.h is generic for all architectures except arm32 which has
its own version.

Similar change was done for msi.h by commit a1b39bae16a6
("asm-generic: Make msi.h a mandatory include/asm header")

Suggested-by: Christoph Hellwig <hch@infradead.org>
Link: https://lore.kernel.org/linux-arm-kernel/20200117080446.GA8980@lst.de/T/#m92bb56b04161057635d4142e1b3b9b6b0a70122e
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Paul Walmsley <paul.walmsley@sifive.com> # for arch/riscv

diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
index bd23f87d6c55a17ce11d774e527ef6588fd10918..d3077c9919629b6fb192676ac6ce07ddb24585f7 100644 (file)
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@ -3,7 +3,6 @@ generic-y += bugs.h
 generic-y += delay.h
 generic-y += div64.h
 generic-y += dma.h
 generic-y += delay.h
 generic-y += div64.h
 generic-y += dma.h

-generic-y += dma-contiguous.h

 generic-y += dma-mapping.h
 generic-y += early_ioremap.h
 generic-y += emergency-restart.h
 generic-y += dma-mapping.h
 generic-y += early_ioremap.h
 generic-y += emergency-restart.h

diff --git a/arch/csky/include/asm/Kbuild b/arch/csky/include/asm/Kbuild
index 4d4754e6bf8917444dfecb82d3eb84e652d2738a..bc15a26c782f9268fc47d1617594881d8d9bec29 100644 (file)
--- a/arch/csky/include/asm/Kbuild
+++ b/arch/csky/include/asm/Kbuild
@@ -7,7 +7,6 @@ generic-y += delay.h
 generic-y += device.h
 generic-y += div64.h
 generic-y += dma.h
 generic-y += device.h
 generic-y += div64.h
 generic-y += dma.h

-generic-y += dma-contiguous.h

 generic-y += dma-mapping.h
 generic-y += emergency-restart.h
 generic-y += exec.h
 generic-y += dma-mapping.h
 generic-y += emergency-restart.h
 generic-y += exec.h

diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild
index 61b0fc2026e62b61a3b9150bf45c885f9b9c5217..179403ae58373c0e3b0e27b3bb5af7776460b72f 100644 (file)
--- a/arch/mips/include/asm/Kbuild
+++ b/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 += current.h
 generic-y += device.h
 generated-y += syscall_table_64_o32.h
 generic-y += current.h
 generic-y += device.h

-generic-y += dma-contiguous.h

 generic-y += emergency-restart.h
 generic-y += export.h
 generic-y += irq_work.h
 generic-y += emergency-restart.h
 generic-y += export.h
 generic-y += irq_work.h

diff --git a/arch/riscv/include/asm/Kbuild b/arch/riscv/include/asm/Kbuild
index 1efaeddf1e4b97abe1de77dc119cd41ac01e343b..ec0ca8c6ab64d6dca0a6763b05ccbc46a355db43 100644 (file)
--- a/arch/riscv/include/asm/Kbuild
+++ b/arch/riscv/include/asm/Kbuild
@@ -7,7 +7,6 @@ generic-y += div64.h
 generic-y += extable.h
 generic-y += flat.h
 generic-y += dma.h
 generic-y += extable.h
 generic-y += flat.h
 generic-y += dma.h

-generic-y += dma-contiguous.h

 generic-y += dma-mapping.h
 generic-y += emergency-restart.h
 generic-y += exec.h
 generic-y += dma-mapping.h
 generic-y += emergency-restart.h
 generic-y += exec.h

diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild
index 2531f673f099cb6ccdac14ff153f65eb59fcdc46..1832ae6442ef846e3ae3d936fd8b4e1d7d53c3d8 100644 (file)
--- a/arch/s390/include/asm/Kbuild
+++ b/arch/s390/include/asm/Kbuild
@@ -7,7 +7,6 @@ generated-y += unistd_nr.h
 generic-y += asm-offsets.h
 generic-y += cacheflush.h
 generic-y += device.h
 generic-y += asm-offsets.h
 generic-y += cacheflush.h
 generic-y += device.h

-generic-y += dma-contiguous.h

 generic-y += dma-mapping.h
 generic-y += div64.h
 generic-y += emergency-restart.h
 generic-y += dma-mapping.h
 generic-y += div64.h
 generic-y += emergency-restart.h

diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild
index 8b52bc5ddf694b86fb63c6335ecca46e2f87962f..ea34464d6221633644d3a0d3f00e1cef678f22d4 100644 (file)
--- a/arch/x86/include/asm/Kbuild
+++ b/arch/x86/include/asm/Kbuild
@@ -7,7 +7,6 @@ generated-y += unistd_32_ia32.h
 generated-y += unistd_64_x32.h
 generated-y += xen-hypercalls.h
 
 generated-y += unistd_64_x32.h
 generated-y += xen-hypercalls.h
 

-generic-y += dma-contiguous.h

 generic-y += early_ioremap.h
 generic-y += export.h
 generic-y += mcs_spinlock.h
 generic-y += early_ioremap.h
 generic-y += export.h
 generic-y += mcs_spinlock.h

diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild
index 3acc31e55e029568f1971501c7c6ffc20ed391ef..271917c24b7fcef9933a3ae3f34968937c14fffd 100644 (file)
--- a/arch/xtensa/include/asm/Kbuild
+++ b/arch/xtensa/include/asm/Kbuild
@@ -4,7 +4,6 @@ generic-y += bug.h
 generic-y += compat.h
 generic-y += device.h
 generic-y += div64.h
 generic-y += compat.h
 generic-y += device.h
 generic-y += div64.h

-generic-y += dma-contiguous.h

 generic-y += dma-mapping.h
 generic-y += emergency-restart.h
 generic-y += exec.h
 generic-y += dma-mapping.h
 generic-y += emergency-restart.h
 generic-y += exec.h

diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
index ddfee1bd9dc158fefd776e5648c33f65742dce7d..cd17d50697cc240ed6ba068a91ad375742a11a45 100644 (file)
--- a/include/asm-generic/Kbuild
+++ b/include/asm-generic/Kbuild
@@ -4,5 +4,6 @@
 # (This file is not included when SRCARCH=um since UML borrows several
 # asm headers from the host architecutre.)
 
 # (This file is not included when SRCARCH=um since UML borrows several
 # asm headers from the host architecutre.)
 

+mandatory-y += dma-contiguous.h

 mandatory-y += msi.h
 mandatory-y += simd.h
 mandatory-y += msi.h
 mandatory-y += simd.h