diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 13:03:00 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 13:03:00 -0800 |
commit | 6a1000bd27035bba17ede9dc915166276a811edb (patch) | |
tree | 92389983cc8bd09ba5b1cdebabfcad882f8ce3f3 /arch/x86/mm/testmmiotrace.c | |
parent | Merge tag 'for-5.6/libata-2020-01-27' of git://git.kernel.dk/linux-block (diff) | |
parent | remove ioremap_nocache and devm_ioremap_nocache (diff) | |
download | linux-dev-6a1000bd27035bba17ede9dc915166276a811edb.tar.xz linux-dev-6a1000bd27035bba17ede9dc915166276a811edb.zip |
Merge tag 'ioremap-5.6' of git://git.infradead.org/users/hch/ioremap
Pull ioremap updates from Christoph Hellwig:
"Remove the ioremap_nocache API (plus wrappers) that are always
identical to ioremap"
* tag 'ioremap-5.6' of git://git.infradead.org/users/hch/ioremap:
remove ioremap_nocache and devm_ioremap_nocache
MIPS: define ioremap_nocache to ioremap
Diffstat (limited to 'arch/x86/mm/testmmiotrace.c')
-rw-r--r-- | arch/x86/mm/testmmiotrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/testmmiotrace.c b/arch/x86/mm/testmmiotrace.c index 92153d054d6c..bda73cb7a044 100644 --- a/arch/x86/mm/testmmiotrace.c +++ b/arch/x86/mm/testmmiotrace.c @@ -79,7 +79,7 @@ static void do_read_far_test(void __iomem *p) static void do_test(unsigned long size) { - void __iomem *p = ioremap_nocache(mmio_address, size); + void __iomem *p = ioremap(mmio_address, size); if (!p) { pr_err("could not ioremap, aborting.\n"); return; @@ -104,7 +104,7 @@ static void do_test_bulk_ioremapping(void) int i; for (i = 0; i < 10; ++i) { - p = ioremap_nocache(mmio_address, PAGE_SIZE); + p = ioremap(mmio_address, PAGE_SIZE); if (p) iounmap(p); } |