Skip to contentSkip to conversation

x86: uaccess: fix compilation error on CONFIG_M386

PATCH Applied Hiroshi Shimamoto 2 participants 2 messages Jan 29, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: uaccess: fix compilation error on CONFIG_M386

From: Hiroshi Shimamoto <[email protected]>

Impact: fix compilation error

In case of !CONFIG_X86_WP_WORKS_OK, __put_user_size_ex() is not defined. Add macros for !CONFIG_X86_WP_WORKS_OK case.

---
 arch/x86/include/asm/uaccess.h |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)
arch/x86/include/asm/uaccess.h +20 -2
index 0ec6de4..b9a2415 100644
@@ -525,8 +525,6 @@ struct __large_struct { unsigned long buf[100]; };
  */
 #define get_user_try		uaccess_try
 #define get_user_catch(err)	uaccess_catch(err)
-#define put_user_try		uaccess_try
-#define put_user_catch(err)	uaccess_catch(err)
 
 #define get_user_ex(x, ptr)	do {					\
 	unsigned long __gue_val;					\
@@ -534,9 +532,29 @@ struct __large_struct { unsigned long buf[100]; };
 	(x) = (__force __typeof__(*(ptr)))__gue_val;			\
 } while (0)
 
+#ifdef CONFIG_X86_WP_WORKS_OK
+
+#define put_user_try		uaccess_try
+#define put_user_catch(err)	uaccess_catch(err)
+
 #define put_user_ex(x, ptr)						\
 	__put_user_size_ex((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
 
+#else /* !CONFIG_X86_WP_WORKS_OK */
+
+#define put_user_try		do {		\
+	int __uaccess_err = 0;
+
+#define put_user_catch(err)			\
+	(err) |= __uaccess_err;			\
+} while (0)
+
+#define put_user_ex(x, ptr)	do {		\
+	__uaccess_err |= __put_user(x, ptr);	\
+} while (0)
+
+#endif /* CONFIG_X86_WP_WORKS_OK */
+
 /*
  * movsl can be slow when source and dest are not both 8-byte aligned
  */
Signature · 1 line
1.6.0.4
Applied
#1 lore raw
Quoted 6 lines · Hiroshi Shimamoto

From: Hiroshi Shimamoto <[email protected]>

Impact: fix compilation error

In case of !CONFIG_X86_WP_WORKS_OK, __put_user_size_ex() is not defined. Add macros for !CONFIG_X86_WP_WORKS_OK case.

applied to tip/x86/uaccess, thanks!

Ingo