aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-09-21 13:56:43 +0200
committerIngo Molnar <mingo@elte.hu>2010-09-21 13:56:49 +0200
commitcf84fd96323633be7d437e1de4505fc82ff2c11a (patch)
tree094b7a7421945c9ea244f3605378065935f1c100 /arch/s390/include
parent31915ab4cbf507aadab40847cf9989da5e88b090 (diff)
parentb30a3f6257ed2105259b404d419b4964e363928c (diff)
downloadkernel_samsung_smdk4412-cf84fd96323633be7d437e1de4505fc82ff2c11a.zip
kernel_samsung_smdk4412-cf84fd96323633be7d437e1de4505fc82ff2c11a.tar.gz
kernel_samsung_smdk4412-cf84fd96323633be7d437e1de4505fc82ff2c11a.tar.bz2
Merge commit 'v2.6.36-rc5' into sched/core
Merge reason: Pick up the latest fixes in -rc5. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/s390/include')
-rw-r--r--arch/s390/include/asm/compat.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h
index 104f200..a875c2f 100644
--- a/arch/s390/include/asm/compat.h
+++ b/arch/s390/include/asm/compat.h
@@ -181,7 +181,7 @@ static inline int is_compat_task(void)
#endif
-static inline void __user *compat_alloc_user_space(long len)
+static inline void __user *arch_compat_alloc_user_space(long len)
{
unsigned long stack;