]> err.no Git - linux-2.6/commitdiff
[PATCH] uml: reenable compilation of enable_timer, disabled by mistake
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Fri, 20 Oct 2006 06:28:22 +0000 (23:28 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 20 Oct 2006 17:26:36 +0000 (10:26 -0700)
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>
arch/um/os-Linux/time.c

index 38be096e750f0ec98d4887275f9f48abc274be3b..2115b8beb54167ffe9c522a5fbe6727b1e547137 100644 (file)
@@ -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);