This fixes a problem introduced in this commit:
commit c871780b5afa182878884bf5ccd8df4817a2660f
Author: Arik Nemtsov <arik@xxxxxxxxxx>
Date: Wed Aug 14 10:48:05 2013 +0300
backports: rename some mem functions to not break custom kernels
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
Cc: Arik Nemtsov <arik@xxxxxxxxxx>
---
backport/backport-include/linux/io.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/backport/backport-include/linux/io.h b/backport/backport-include/linux/io.h
index 5447df8..84a8c21 100644
--- a/backport/backport-include/linux/io.h
+++ b/backport/backport-include/linux/io.h
@@ -13,10 +13,11 @@
* arch_phys_del_wc(0) or arch_phys_del_wc(any error code) is guaranteed
* to have no effect.
*/
+#ifndef arch_phys_wc_add
+
#define arch_phys_wc_add LINUX_BACKPORT(arch_phys_wc_add)
#define arch_phys_wc_del LINUX_BACKPORT(arch_phys_wc_del)
-#ifndef arch_phys_wc_add
#ifdef CONFIG_MTRR
extern int __must_check arch_phys_wc_add(unsigned long base,
unsigned long size);
@@ -32,8 +33,6 @@ static inline void arch_phys_wc_del(int handle)
{
}
#endif /* CONFIG_MTRR */
-
-#define arch_phys_wc_add arch_phys_wc_add
#endif
#endif /* __BACKPORT_LINUX_IO_H */
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
