Merge branch 'linus' into x86/ptemask

[linux-2.6-omap-h63xx.git] / arch / um / include / os.h

diff --git a/arch/um/include/os.h b/arch/um/include/os.h
index e2716ac8889accd7f33ca8d381f014d3b1bd7283..db5be46e3e186677c8f16c93f585e82413d7740f 100644 (file)
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
@@ -299,6 +299,6 @@ extern int os_arch_prctl(int pid, int code, unsigned long *addr);
 extern int get_pty(void);
 
 /* sys-$ARCH/task_size.c */
-extern unsigned long os_get_task_size(void);
+extern unsigned long os_get_top_address(void);
 
 #endif