summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-04-07 19:50:06 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-09 11:53:52 -0700
commit3d34ee6891e274dfb6a22930546d37738cdbe9c4 (patch)
tree46b5ea716446d598bfb5680af05aac4aed5c6284
parentac04dcaf6f567307fbeef9c3c1fff35280e53f02 (diff)
downloadlinux-3d34ee6891e274dfb6a22930546d37738cdbe9c4.tar.gz
[PATCH] x86_64: Don't return error for HPET initialization in initcall
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/x86_64/kernel/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c
index ef8bc46dc140..2eeaa95edff0 100644
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
@@ -726,7 +726,7 @@ static __init int late_hpet_init(void)
 	unsigned int 		ntimer;
 
 	if (!vxtime.hpet_address)
-        	return -1;
+        	return 0;
 
 	memset(&hd, 0, sizeof (hd));