diff options
| author | Helge Deller <deller@gmx.de> | 2006-12-20 00:35:57 +0100 |
|---|---|---|
| committer | Kyle McMartin <kyle@athena.road.mcmartin.ca> | 2007-02-17 00:56:16 -0500 |
| commit | ca72a223278483e62530ca9e5b4f9b39318868ea (patch) | |
| tree | 7cc66d1b40ecd3819e0cb14dbe77936c1fa579c5 /include/asm-parisc | |
| parent | 94a1981df056e349b926164915894436acdb8dd5 (diff) | |
| download | blackbird-op-linux-ca72a223278483e62530ca9e5b4f9b39318868ea.tar.gz blackbird-op-linux-ca72a223278483e62530ca9e5b4f9b39318868ea.zip | |
[PARISC] fix fixup declarations for 32bit and use CONFIG_64BIT
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'include/asm-parisc')
| -rw-r--r-- | include/asm-parisc/uaccess.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-parisc/uaccess.h b/include/asm-parisc/uaccess.h index 98c36dcadf80..d5d831ea7bc6 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) */ /* |
