summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2006-03-27 01:16:09 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-27 08:44:48 -0800
commitf267fa9f5b377b5cecdb2baf332fec08bb71246d (patch)
tree6e1d51ecaa4b7c990b835e382acce8409607dbbd /include
parent66e863acd7f2fb02fef709d5f0ab069445d4a58c (diff)
downloadlinux-f267fa9f5b377b5cecdb2baf332fec08bb71246d.tar.gz
linux-f267fa9f5b377b5cecdb2baf332fec08bb71246d.tar.bz2
linux-f267fa9f5b377b5cecdb2baf332fec08bb71246d.zip
[PATCH] s390: add ptr_to_compat()
Add ptr_to_compat() to s390 - needed by the new robust-futex code. Signed-off-by: Ingo Molnar <mingo@elte.hu> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> untested. CHECKME: am i right about the 0x7fffffffUL masking? Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-s390/compat.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-s390/compat.h b/include/asm-s390/compat.h
index a007715f4aea..356a0b183539 100644
--- a/include/asm-s390/compat.h
+++ b/include/asm-s390/compat.h
@@ -128,6 +128,11 @@ static inline void __user *compat_ptr(compat_uptr_t uptr)
return (void __user *)(unsigned long)(uptr & 0x7fffffffUL);
}
+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)
{
unsigned long stack;