git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'stable/for-linus-3.14-rc0-tag' of git://git.kernel.org/pub/scm/linux/kerne...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
include
/
asm
/
xen
/
page.h
diff --git
a/arch/arm/include/asm/xen/page.h
b/arch/arm/include/asm/xen/page.h
index 709c4b4d2f1dbaa60a5a5b701ab65b04606b4868..e0965abacb7d37e7a8bc5b1f9f072ea299839cd6 100644
(file)
--- a/
arch/arm/include/asm/xen/page.h
+++ b/
arch/arm/include/asm/xen/page.h
@@
-117,7
+117,7
@@
static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn)
return __set_phys_to_machine(pfn, mfn);
}
-#define xen_remap(cookie, size) ioremap_cache
d
((cookie), (size))
+#define xen_remap(cookie, size) ioremap_cache((cookie), (size))
#define xen_unmap(cookie) iounmap((cookie))
#endif /* _ASM_ARM_XEN_PAGE_H */