summaryrefslogtreecommitdiff
path: root/include/linux/io.h
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2023-06-30 08:41:39 -0700
committerAndrew Morton <akpm@linux-foundation.org>2023-06-30 08:41:39 -0700
commit44f10dbefd5e41b3385af91f855a57aa2afaf40e (patch)
tree944c9f1cda8322691468e6f10dc5b0d41c487621 /include/linux/io.h
parent0a30901b0732a59e038088d3de3e5611db1870d3 (diff)
parente55e5df193d247a38a5e1ac65a5316a0adcc22fa (diff)
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to 'include/linux/io.h')
-rw-r--r--include/linux/io.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/io.h b/include/linux/io.h
index 308f4f0cfb93..7304f2a69960 100644
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -68,6 +68,11 @@ void *devm_memremap(struct device *dev, resource_size_t offset,
size_t size, unsigned long flags);
void devm_memunmap(struct device *dev, void *addr);
+/* architectures can override this */
+pgprot_t __init early_memremap_pgprot_adjust(resource_size_t phys_addr,
+ unsigned long size, pgprot_t prot);
+
+
#ifdef CONFIG_PCI
/*
* The PCI specifications (Rev 3.0, 3.2.5 "Transaction Ordering and