Skip to content

Commit

Permalink
[POWERPC] Add inatomic versions of __get_user and __put_user
Browse files Browse the repository at this point in the history
Those are needed by things like alignment exception fixup handlers
since those can now be triggered by copy_tofrom_user_inatomic.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Benjamin Herrenschmidt authored and Paul Mackerras committed Apr 12, 2007
1 parent 06533e2 commit e68c825
Showing 1 changed file with 28 additions and 0 deletions.
28 changes: 28 additions & 0 deletions include/asm-powerpc/uaccess.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,18 @@ struct exception_table_entry {
__get_user_nocheck((x), (ptr), sizeof(*(ptr)))
#define __put_user(x, ptr) \
__put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))

#ifndef __powerpc64__
#define __get_user64(x, ptr) \
__get_user64_nocheck((x), (ptr), sizeof(*(ptr)))
#define __put_user64(x, ptr) __put_user(x, ptr)
#endif

#define __get_user_inatomic(x, ptr) \
__get_user_nosleep((x), (ptr), sizeof(*(ptr)))
#define __put_user_inatomic(x, ptr) \
__put_user_nosleep((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))

#define __get_user_unaligned __get_user
#define __put_user_unaligned __put_user

Expand Down Expand Up @@ -198,6 +204,16 @@ do { \
__pu_err; \
})

#define __put_user_nosleep(x, ptr, size) \
({ \
long __pu_err; \
__typeof__(*(ptr)) __user *__pu_addr = (ptr); \
__chk_user_ptr(ptr); \
__put_user_size((x), __pu_addr, (size), __pu_err); \
__pu_err; \
})


extern long __get_user_bad(void);

#define __get_user_asm(x, addr, err, op) \
Expand Down Expand Up @@ -297,6 +313,18 @@ do { \
__gu_err; \
})

#define __get_user_nosleep(x, ptr, size) \
({ \
long __gu_err; \
unsigned long __gu_val; \
const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \
__chk_user_ptr(ptr); \
__get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
(x) = (__typeof__(*(ptr)))__gu_val; \
__gu_err; \
})


/* more complex routines */

extern unsigned long __copy_tofrom_user(void __user *to,
Expand Down

0 comments on commit e68c825

Please sign in to comment.