Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f267fa9f5b377b5cecdb2baf332fec08bb71246d

Authored by Ingo Molnar
Committed by Linus Torvalds
1 parent 66e863acd7
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 5 additions and 0 deletions Side-by-side Diff

include/asm-s390/compat.h
Diff comments   View file @ f267fa9
... ... @@ -128,6 +128,11 @@
128 128 return (void __user *)(unsigned long)(uptr & 0x7fffffffUL);
129 129 }
130 130  
  131 +static inline compat_uptr_t ptr_to_compat(void __user *uptr)
  132 +{
  133 + return (u32)(unsigned long)uptr;
  134 +}
  135 +
131 136 static inline void __user *compat_alloc_user_space(long len)
132 137 {
133 138 unsigned long stack;