diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-02 10:16:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-02 10:16:44 -0800 |
| commit | 0bf82cccd1e17135f880c161bc7926f5b25df34c (patch) | |
| tree | 45935237f81b08d34f52c7bf5fe8d3d3c6a8b11b /arch/sparc | |
| parent | 391e572cd1a63aee9c8d4c2d5e3dada91d86bc43 (diff) | |
| parent | 5769907ade8dda7002b304c03ef9e4ee5c1e0821 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix PCI resource mapping on sparc64
sparc64: Kill annoying warning when building compat_binfmt_elf.o
sparc32: kernel/trace/trace.c wants DIE_OOPS
sparc64: Fix __copy_{to,from}_user_inatomic defines.
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/include/asm/processor_64.h | 4 | ||||
| -rw-r--r-- | arch/sparc/include/asm/uaccess_64.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/include/asm/processor_64.h b/arch/sparc/include/asm/processor_64.h index 137a6bd72fc..59fcebb8f44 100644 --- a/arch/sparc/include/asm/processor_64.h +++ b/arch/sparc/include/asm/processor_64.h @@ -36,10 +36,10 @@ #define VPTE_SIZE (1 << (VA_BITS - PAGE_SHIFT + 3)) #endif -#define TASK_SIZE ((unsigned long)-VPTE_SIZE) #define TASK_SIZE_OF(tsk) \ (test_tsk_thread_flag(tsk,TIF_32BIT) ? \ - (1UL << 32UL) : TASK_SIZE) + (1UL << 32UL) : ((unsigned long)-VPTE_SIZE)) +#define TASK_SIZE TASK_SIZE_OF(current) #ifdef __KERNEL__ #define STACK_TOP32 ((1UL << 32UL) - PAGE_SIZE) diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h index 296ef30e05c..c64e767a3e4 100644 --- a/arch/sparc/include/asm/uaccess_64.h +++ b/arch/sparc/include/asm/uaccess_64.h @@ -265,8 +265,8 @@ extern long __strnlen_user(const char __user *, long len); #define strlen_user __strlen_user #define strnlen_user __strnlen_user -#define __copy_to_user_inatomic __copy_to_user -#define __copy_from_user_inatomic __copy_from_user +#define __copy_to_user_inatomic ___copy_to_user +#define __copy_from_user_inatomic ___copy_from_user #endif /* __ASSEMBLY__ */ |