diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 08:06:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 08:06:09 -0800 |
| commit | 423ab71a8bd2345f87724abe320092a3a516b0bb (patch) | |
| tree | 5d5eb306001e4341c3c073777f4d0b9e05ccd454 /include/asm-powerpc | |
| parent | b7ed1de0ae4edb3fd2c53fa3dd7e6f104beb6d00 (diff) | |
| parent | 63f716b9419420defb3e550a1e5f526c11b2ed2d (diff) | |
| download | linux-423ab71a8bd2345f87724abe320092a3a516b0bb.tar.gz | |
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/compat.h | 5 | ||||
| -rw-r--r-- | include/asm-powerpc/thread_info.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/asm-powerpc/compat.h b/include/asm-powerpc/compat.h index accb80c9a339c..aacaabd28ac10 100644 --- a/include/asm-powerpc/compat.h +++ b/include/asm-powerpc/compat.h @@ -126,6 +126,11 @@ static inline void __user *compat_ptr(compat_uptr_t uptr) return (void __user *)(unsigned long)uptr; } +static inline compat_uptr_t ptr_to_compat(void __user *uptr) +{ + return (u32)(unsigned long)uptr; +} + static inline void __user *compat_alloc_user_space(long len) { struct pt_regs *regs = current->thread.regs; diff --git a/include/asm-powerpc/thread_info.h b/include/asm-powerpc/thread_info.h index 67cdaf3ae9fc6..c044ec16a8791 100644 --- a/include/asm-powerpc/thread_info.h +++ b/include/asm-powerpc/thread_info.h @@ -37,7 +37,7 @@ struct thread_info { int preempt_count; /* 0 => preemptable, <0 => BUG */ struct restart_block restart_block; - void *nvgprs_frame; + void __user *nvgprs_frame; /* low level flags - has atomic operations done on it */ unsigned long flags ____cacheline_aligned_in_smp; }; |