--- v2
+++ v4
@@ -1,6 +1,6 @@
user_read_access_begin() and user_write_access_begin() and
user_access_begin() are now very similar. Create a common
-__user_access_begin() that take direction as parameter.
+__user_access_begin() that takes direction as parameter.
In order to avoid a warning with the conditional call of
barrier_nospec() which is sometimes an empty macro, change it to a
@@ -8,6 +8,8 @@
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
+v4: Rebase on top of core-scoped-uaccess tag
+
v2: New
---
arch/powerpc/include/asm/barrier.h | 2 +-
@@ -15,7 +17,7 @@
2 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
-index b95b666f0374..7acbf27cac6c 100644
+index 9e9833faa4af8..9d2f612cfb1d7 100644
--- a/arch/powerpc/include/asm/barrier.h
+++ b/arch/powerpc/include/asm/barrier.h
@@ -102,7 +102,7 @@ do { \
@@ -28,7 +30,7 @@
/*
diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
-index 698996f34891..49254f7d9069 100644
+index 7846ee59e3747..721d65dbbb2e5 100644
--- a/arch/powerpc/include/asm/uaccess.h
+++ b/arch/powerpc/include/asm/uaccess.h
@@ -410,50 +410,30 @@ copy_mc_to_user(void __user *to, const void *from, unsigned long n)
@@ -93,7 +95,7 @@
+#define user_access_save prevent_user_access_return
+#define user_access_restore restore_user_access
- #define unsafe_get_user(x, p, e) do { \
+ #define arch_unsafe_get_user(x, p, e) do { \
__long_type(*(p)) __gu_val; \
--
2.49.0