From: Helge Deller Date: Tue, 19 Dec 2006 23:35:57 +0000 (+0100) Subject: [PARISC] fix fixup declarations for 32bit and use CONFIG_64BIT X-Git-Tag: v2.6.21-rc2~35^2~36 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ca72a223278483e62530ca9e5b4f9b39318868ea;p=~shefty%2Frdma-dev.git [PARISC] fix fixup declarations for 32bit and use CONFIG_64BIT Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin --- diff --git a/include/asm-parisc/uaccess.h b/include/asm-parisc/uaccess.h index 98c36dcadf8..d5d831ea7bc 100644 --- a/include/asm-parisc/uaccess.h +++ b/include/asm-parisc/uaccess.h @@ -42,7 +42,7 @@ static inline long access_ok(int type, const void __user * addr, #define put_user __put_user #define get_user __get_user -#if !defined(__LP64__) +#if !defined(CONFIG_64BIT) #define LDD_KERNEL(ptr) __get_kernel_bad(); #define LDD_USER(ptr) __get_user_bad(); #define STD_KERNEL(x, ptr) __put_kernel_asm64(x,ptr) @@ -185,7 +185,7 @@ struct exception_data { : "r1") -#if !defined(__LP64__) +#if !defined(CONFIG_64BIT) #define __put_kernel_asm64(__val,ptr) do { \ u64 __val64 = (u64)(__val); \ @@ -211,15 +211,15 @@ struct exception_data { "\n1:\tstw %2,0(%%sr3,%1)\n" \ "\n2:\tstw %3,4(%%sr3,%1)\n" \ "\t.section __ex_table,\"aw\"\n" \ - "\t.word\t1b,fixup_get_user_skip_2\n" \ - "\t.word\t2b,fixup_get_user_skip_1\n" \ + "\t.word\t1b,fixup_put_user_skip_2\n" \ + "\t.word\t2b,fixup_put_user_skip_1\n" \ "\t.previous" \ : "=r"(__pu_err) \ : "r"(ptr), "r"(hi), "r"(lo), "0"(__pu_err) \ : "r1"); \ } while (0) -#endif /* !defined(__LP64__) */ +#endif /* !defined(CONFIG_64BIT) */ /*