#define __put_user64(x, ptr) __put_user(x, ptr)
#endif
-#ifdef __powerpc64__
#define __get_user_unaligned __get_user
#define __put_user_unaligned __put_user
-#endif
extern long __put_user_bad(void);
-#ifdef __powerpc64__
-#define __EX_TABLE_ALIGN "3"
-#define __EX_TABLE_TYPE "llong"
-#else
-#define __EX_TABLE_ALIGN "2"
-#define __EX_TABLE_TYPE "long"
-#endif
-
/*
* We don't tell gcc that we are accessing memory, but this is OK
* because we do not write to any memory gcc knows about, so there
" b 2b\n" \
".previous\n" \
".section __ex_table,\"a\"\n" \
- " .align " __EX_TABLE_ALIGN "\n" \
- " ."__EX_TABLE_TYPE" 1b,3b\n" \
+ " .balign %5\n" \
+ PPC_LONG "1b,3b\n" \
".previous" \
: "=r" (err) \
- : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err))
+ : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err),\
+ "i"(sizeof(unsigned long)))
#ifdef __powerpc64__
#define __put_user_asm2(x, ptr, retval) \
" b 3b\n" \
".previous\n" \
".section __ex_table,\"a\"\n" \
- " .align " __EX_TABLE_ALIGN "\n" \
- " ." __EX_TABLE_TYPE " 1b,4b\n" \
- " ." __EX_TABLE_TYPE " 2b,4b\n" \
+ " .balign %5\n" \
+ PPC_LONG "1b,4b\n" \
+ PPC_LONG "2b,4b\n" \
".previous" \
: "=r" (err) \
- : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err))
+ : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err),\
+ "i"(sizeof(unsigned long)))
#endif /* __powerpc64__ */
#define __put_user_size(x, ptr, size, retval) \
" b 2b\n" \
".previous\n" \
".section __ex_table,\"a\"\n" \
- " .align "__EX_TABLE_ALIGN "\n" \
- " ." __EX_TABLE_TYPE " 1b,3b\n" \
+ " .balign %5\n" \
+ PPC_LONG "1b,3b\n" \
".previous" \
: "=r" (err), "=r" (x) \
- : "b" (addr), "i" (-EFAULT), "0" (err))
+ : "b" (addr), "i" (-EFAULT), "0" (err), \
+ "i"(sizeof(unsigned long)))
#ifdef __powerpc64__
#define __get_user_asm2(x, addr, err) \
" b 3b\n" \
".previous\n" \
".section __ex_table,\"a\"\n" \
- " .align " __EX_TABLE_ALIGN "\n" \
- " ." __EX_TABLE_TYPE " 1b,4b\n" \
- " ." __EX_TABLE_TYPE " 2b,4b\n" \
+ " .balign %5\n" \
+ PPC_LONG "1b,4b\n" \
+ PPC_LONG "2b,4b\n" \
".previous" \
: "=r" (err), "=&r" (x) \
- : "b" (addr), "i" (-EFAULT), "0" (err))
+ : "b" (addr), "i" (-EFAULT), "0" (err), \
+ "i"(sizeof(unsigned long)))
#endif /* __powerpc64__ */
#define __get_user_size(x, ptr, size, retval) \
return n;
}
-#define __copy_to_user_inatomic __copy_to_user
-#define __copy_from_user_inatomic __copy_from_user
-
#else /* __powerpc64__ */
#define __copy_in_user(to, from, size) \
extern unsigned long copy_in_user(void __user *to, const void __user *from,
unsigned long n);
+#endif /* __powerpc64__ */
+
static inline unsigned long __copy_from_user_inatomic(void *to,
const void __user *from, unsigned long n)
{
__get_user_size(*(u64 *)to, from, 8, ret);
break;
}
- return (ret == -EFAULT) ? n : 0;
+ if (ret == 0)
+ return 0;
}
- return __copy_tofrom_user((__force void __user *) to, from, n);
+ return __copy_tofrom_user((__force void __user *)to, from, n);
}
static inline unsigned long __copy_to_user_inatomic(void __user *to,
__put_user_size(*(u64 *)from, (u64 __user *)to, 8, ret);
break;
}
- return (ret == -EFAULT) ? n : 0;
+ if (ret == 0)
+ return 0;
}
- return __copy_tofrom_user(to, (__force const void __user *) from, n);
+ return __copy_tofrom_user(to, (__force const void __user *)from, n);
}
-#endif /* __powerpc64__ */
-
static inline unsigned long __copy_from_user(void *to,
const void __user *from, unsigned long size)
{
might_sleep();
-#ifndef __powerpc64__
- return __copy_tofrom_user((__force void __user *)to, from, size);
-#else /* __powerpc64__ */
return __copy_from_user_inatomic(to, from, size);
-#endif /* __powerpc64__ */
}
static inline unsigned long __copy_to_user(void __user *to,
const void *from, unsigned long size)
{
might_sleep();
-#ifndef __powerpc64__
- return __copy_tofrom_user(to, (__force void __user *)from, size);
-#else /* __powerpc64__ */
return __copy_to_user_inatomic(to, from, size);
-#endif /* __powerpc64__ */
}
extern unsigned long __clear_user(void __user *addr, unsigned long size);
might_sleep();
if (likely(access_ok(VERIFY_WRITE, addr, size)))
return __clear_user(addr, size);
-#ifndef __powerpc64__
if ((unsigned long)addr < TASK_SIZE) {
unsigned long over = (unsigned long)addr + size - TASK_SIZE;
return __clear_user(addr, size - over) + over;
}
-#endif /* __powerpc64__ */
return size;
}