OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v4.2-rc8' into x86/mm, before applying new changes
[sagit-ice-cold/kernel_xiaomi_msm8998.git]
/
arch
/
x86
/
include
/
asm
/
io.h
diff --git
a/arch/x86/include/asm/io.h
b/arch/x86/include/asm/io.h
index
de25aad
..
7cfc085
100644
(file)
--- a/
arch/x86/include/asm/io.h
+++ b/
arch/x86/include/asm/io.h
@@
-250,6
+250,12
@@
static inline void flush_write_buffers(void)
#endif
}
+static inline void __pmem *arch_memremap_pmem(resource_size_t offset,
+ unsigned long size)
+{
+ return (void __force __pmem *) ioremap_cache(offset, size);
+}
+
#endif /* __KERNEL__ */
extern void native_io_delay(void);