From: john stultz <johnstul@us.ibm.com>
Date: Tue, 13 Dec 2005 06:17:13 +0000 (-0800)
Subject: [PATCH] x86_64: Fix collision between pmtimer and pit/hpet
X-Git-Tag: v2.6.15-rc6~87
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd4954714e8e7db9f6eb5878fa6111c46445ca81;p=pandora-kernel.git

[PATCH] x86_64: Fix collision between pmtimer and pit/hpet

On systems that do not support the HPET legacy functions (basically the IBM
x460, but there could be others), in time_init() we accidentally fall into a
PM timer conditional and set the vxtime_hz value to the PM timer's frequency.
We then use this value with the HPET for timekeeping.

This patch (which mimics the behavior in time_init_gtod) corrects the
collision.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

Reading git-diff-tree failed