summaryrefslogtreecommitdiffstats
path: root/kernel/arch/ia64
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/arch/ia64')
-rw-r--r--kernel/arch/ia64/include/asm/io.h1
-rw-r--r--kernel/arch/ia64/include/asm/uaccess.h20
2 files changed, 10 insertions, 11 deletions
diff --git a/kernel/arch/ia64/include/asm/io.h b/kernel/arch/ia64/include/asm/io.h
index 9041bbe2b..8fdb9c7ee 100644
--- a/kernel/arch/ia64/include/asm/io.h
+++ b/kernel/arch/ia64/include/asm/io.h
@@ -436,6 +436,7 @@ static inline void __iomem * ioremap_cache (unsigned long phys_addr, unsigned lo
return ioremap(phys_addr, size);
}
#define ioremap_cache ioremap_cache
+#define ioremap_uc ioremap_nocache
/*
diff --git a/kernel/arch/ia64/include/asm/uaccess.h b/kernel/arch/ia64/include/asm/uaccess.h
index 4f3fb6ccb..40c2027a2 100644
--- a/kernel/arch/ia64/include/asm/uaccess.h
+++ b/kernel/arch/ia64/include/asm/uaccess.h
@@ -263,17 +263,15 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
__cu_len; \
})
-#define copy_from_user(to, from, n) \
-({ \
- void *__cu_to = (to); \
- const void __user *__cu_from = (from); \
- long __cu_len = (n); \
- \
- __chk_user_ptr(__cu_from); \
- if (__access_ok(__cu_from, __cu_len, get_fs())) \
- __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
- __cu_len; \
-})
+static inline unsigned long
+copy_from_user(void *to, const void __user *from, unsigned long n)
+{
+ if (likely(__access_ok(from, n, get_fs())))
+ n = __copy_user((__force void __user *) to, from, n);
+ else
+ memset(to, 0, n);
+ return n;
+}
#define __copy_in_user(to, from, size) __copy_user((to), (from), (size))