From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Fri, 20 Oct 2006 06:28:22 +0000 (-0700)
Subject: [PATCH] uml: reenable compilation of enable_timer, disabled by mistake
X-Git-Tag: v2.6.19-rc3~110
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=493e3758be1d5628b4d799fe21d68969edbe32aa;p=linux-2.6

[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>
---

diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c
index 38be096e75..2115b8beb5 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);