diff options
author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2006-10-20 02:28:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:26:36 -0400 |
commit | 493e3758be1d5628b4d799fe21d68969edbe32aa (patch) | |
tree | 74d6e72ec63af141e294a6bec3dbb1ef52e2de1d | |
parent | 8b028bcd0e746ae0f2f218b911032232a32dedd5 (diff) |
[PATCH] uml: reenable compilation of enable_timer, disabled by mistake
CONFIG_MODE_TT does not work there, the UML_ prefixed version must be used -
this causes a link-time failure when CONFIG_MODE_TT is enabled (i.e. always
here, never by Jeff).
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/um/os-Linux/time.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c index 38be096e750f..2115b8beb541 100644 --- a/arch/um/os-Linux/time.c +++ b/arch/um/os-Linux/time.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include "process.h" | 16 | #include "process.h" |
17 | #include "kern_constants.h" | 17 | #include "kern_constants.h" |
18 | #include "os.h" | 18 | #include "os.h" |
19 | #include "uml-config.h" | ||
19 | 20 | ||
20 | int set_interval(int is_virtual) | 21 | int set_interval(int is_virtual) |
21 | { | 22 | { |
@@ -30,7 +31,7 @@ int set_interval(int is_virtual) | |||
30 | return 0; | 31 | return 0; |
31 | } | 32 | } |
32 | 33 | ||
33 | #ifdef CONFIG_MODE_TT | 34 | #ifdef UML_CONFIG_MODE_TT |
34 | void enable_timer(void) | 35 | void enable_timer(void) |
35 | { | 36 | { |
36 | set_interval(1); | 37 | set_interval(1); |