Commit 493e3758 authored Oct 19, 2006 by Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds Oct 20, 2006

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

parent 8b028bcd

arch/um/os-Linux/time.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);