diff --git a/[refs] b/[refs] index b25a2b9a9b32..98905f54d39f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac04dcaf6f567307fbeef9c3c1fff35280e53f02 +refs/heads/master: 3d34ee6891e274dfb6a22930546d37738cdbe9c4 diff --git a/trunk/arch/x86_64/kernel/time.c b/trunk/arch/x86_64/kernel/time.c index ef8bc46dc140..2eeaa95edff0 100644 --- a/trunk/arch/x86_64/kernel/time.c +++ b/trunk/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));