lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: Use PPC_LONG_ALIGN in uaccess.h

Browse Source 
Use the new PPC_LONG_ALIGN macro instead of passing an argument
to the asm for consistency.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Michael Ellerman
2008-07-17 17:17:52 +10:00
committed by Benjamin Herrenschmidt
parent 6a2a24bb75
commit 551c3c04b4
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/asm-powerpc/uaccess.h
View File

@@ -6,6 +6,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/asm-compat.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/page.h> #include <asm/page.h>
@@ -141,12 +142,11 @@ extern long __put_user_bad(void);
" b 2b\n" \ " b 2b\n" \
".previous\n" \ ".previous\n" \
".section __ex_table,\"a\"\n" \ ".section __ex_table,\"a\"\n" \
" .balign %5\n" \ PPC_LONG_ALIGN "\n" \
PPC_LONG "1b,3b\n" \ PPC_LONG "1b,3b\n" \
".previous" \ ".previous" \
: "=r" (err) \ : "=r" (err) \
: "r" (x), "b" (addr), "i" (-EFAULT), "0" (err),\ : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err))
"i"(sizeof(unsigned long)))
#ifdef __powerpc64__ #ifdef __powerpc64__
#define __put_user_asm2(x, ptr, retval) \ #define __put_user_asm2(x, ptr, retval) \
@@ -162,13 +162,12 @@ extern long __put_user_bad(void);
" b 3b\n" \ " b 3b\n" \
".previous\n" \ ".previous\n" \
".section __ex_table,\"a\"\n" \ ".section __ex_table,\"a\"\n" \
" .balign %5\n" \ PPC_LONG_ALIGN "\n" \
PPC_LONG "1b,4b\n" \ PPC_LONG "1b,4b\n" \
PPC_LONG "2b,4b\n" \ PPC_LONG "2b,4b\n" \
".previous" \ ".previous" \
: "=r" (err) \ : "=r" (err) \
: "r" (x), "b" (addr), "i" (-EFAULT), "0" (err),\ : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err))
"i"(sizeof(unsigned long)))
#endif /* __powerpc64__ */ #endif /* __powerpc64__ */
#define __put_user_size(x, ptr, size, retval) \ #define __put_user_size(x, ptr, size, retval) \
@@ -226,12 +225,11 @@ extern long __get_user_bad(void);
" b 2b\n" \ " b 2b\n" \
".previous\n" \ ".previous\n" \
".section __ex_table,\"a\"\n" \ ".section __ex_table,\"a\"\n" \
" .balign %5\n" \ PPC_LONG_ALIGN "\n" \
PPC_LONG "1b,3b\n" \ PPC_LONG "1b,3b\n" \
".previous" \ ".previous" \
: "=r" (err), "=r" (x) \ : "=r" (err), "=r" (x) \
: "b" (addr), "i" (-EFAULT), "0" (err), \ : "b" (addr), "i" (-EFAULT), "0" (err))
"i"(sizeof(unsigned long)))
#ifdef __powerpc64__ #ifdef __powerpc64__
#define __get_user_asm2(x, addr, err) \ #define __get_user_asm2(x, addr, err) \
@@ -249,13 +247,12 @@ extern long __get_user_bad(void);
" b 3b\n" \ " b 3b\n" \
".previous\n" \ ".previous\n" \
".section __ex_table,\"a\"\n" \ ".section __ex_table,\"a\"\n" \
" .balign %5\n" \ PPC_LONG_ALIGN "\n" \
PPC_LONG "1b,4b\n" \ PPC_LONG "1b,4b\n" \
PPC_LONG "2b,4b\n" \ PPC_LONG "2b,4b\n" \
".previous" \ ".previous" \
: "=r" (err), "=&r" (x) \ : "=r" (err), "=&r" (x) \
: "b" (addr), "i" (-EFAULT), "0" (err), \ : "b" (addr), "i" (-EFAULT), "0" (err))
"i"(sizeof(unsigned long)))
#endif /* __powerpc64__ */ #endif /* __powerpc64__ */
#define __get_user_size(x, ptr, size, retval) \ #define __get_user_size(x, ptr, size, retval) \