diff options
author | Jeff Dike <jdike@addtoit.com> | 2006-04-11 07:53:26 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 15:18:35 +0200 |
commit | a5d2f46a97cf8e23f5da17dec50a972642ac409f (patch) | |
tree | 21f822fd8ed87de6c8dcc49fc9236a32a76dd5fc /arch | |
parent | [PATCH] m32r: Remove symbols exported twice (diff) | |
download | linux-a5d2f46a97cf8e23f5da17dec50a972642ac409f.tar.xz linux-a5d2f46a97cf8e23f5da17dec50a972642ac409f.zip |
[PATCH] UML: TLS fixlets
Two small TLS fixes -
arch/um/os-Linux/sys-i386/tls.c uses errno and -E* so it should include
errno.h
__setup_host_supports_tls returns 1, but as an initcall, it should return 0
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/um/os-Linux/sys-i386/tls.c | 1 | ||||
-rw-r--r-- | arch/um/sys-i386/tls.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/os-Linux/sys-i386/tls.c b/arch/um/os-Linux/sys-i386/tls.c index ba21f0e04a2f..120abbe4e3ce 100644 --- a/arch/um/os-Linux/sys-i386/tls.c +++ b/arch/um/os-Linux/sys-i386/tls.c @@ -1,3 +1,4 @@ +#include <errno.h> #include <linux/unistd.h> #include "sysdep/tls.h" #include "user_util.h" diff --git a/arch/um/sys-i386/tls.c b/arch/um/sys-i386/tls.c index a3188e861cc7..71b9796258ef 100644 --- a/arch/um/sys-i386/tls.c +++ b/arch/um/sys-i386/tls.c @@ -378,7 +378,7 @@ static int __init __setup_host_supports_tls(void) { } else printk(KERN_ERR " Host TLS support NOT detected! " "TLS support inside UML will not work\n"); - return 1; + return 0; } __initcall(__setup_host_supports_tls); |