diff options
| author |   Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2006-10-19 23:28:22 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 10:26:36 -0700 |
| commit | 493e3758be1d5628b4d799fe21d68969edbe32aa (patch) | |
| tree | 74d6e72ec63af141e294a6bec3dbb1ef52e2de1d /arch | |
| parent | [PATCH] uml: code convention cleanup of a file (diff) | |
| download | linux-dev-493e3758be1d5628b4d799fe21d68969edbe32aa.tar.xz linux-dev-493e3758be1d5628b4d799fe21d68969edbe32aa.zip | |
[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>
Diffstat (limited to 'arch')
| -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 @@ #include "process.h" #include "kern_constants.h" #include "os.h" +#include "uml-config.h" int set_interval(int is_virtual) { @@ -30,7 +31,7 @@ int set_interval(int is_virtual) return 0; } -#ifdef CONFIG_MODE_TT +#ifdef UML_CONFIG_MODE_TT void enable_timer(void) { set_interval(1); |