diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2024-06-12 18:31:42 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2024-06-12 18:31:42 +0300 |
| commit | 89aa02edaa30e4327ebc8fca9b80795bbfd4ce9b (patch) | |
| tree | 10c96a25b500be034e38db049a22f53881b0fb4d /include/linux/io.h | |
| parent | ec3ac2c8d941dad959dcdc760aa43bc45785d346 (diff) | |
| parent | 1ddaaa244021aba8496536a6627b4ad2bc0f936a (diff) | |
| download | linux-89aa02edaa30e4327ebc8fca9b80795bbfd4ce9b.tar.xz | |
Merge drm/drm-next into drm-xe-next
Needed to get tracing cleanup and add mmio tracing series.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/linux/io.h')
| -rw-r--r-- | include/linux/io.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/io.h b/include/linux/io.h index 235ba7d80a8f..59ec5eea696c 100644 --- a/include/linux/io.h +++ b/include/linux/io.h @@ -6,6 +6,7 @@ #ifndef _LINUX_IO_H #define _LINUX_IO_H +#include <linux/sizes.h> #include <linux/types.h> #include <linux/init.h> #include <linux/bug.h> @@ -16,9 +17,15 @@ struct device; struct resource; -__visible void __iowrite32_copy(void __iomem *to, const void *from, size_t count); +#ifndef __iowrite32_copy +void __iowrite32_copy(void __iomem *to, const void *from, size_t count); +#endif + void __ioread32_copy(void *to, const void __iomem *from, size_t count); + +#ifndef __iowrite64_copy void __iowrite64_copy(void __iomem *to, const void *from, size_t count); +#endif #ifdef CONFIG_MMU int ioremap_page_range(unsigned long addr, unsigned long end, |