x86: don't use tsc_khz to calculate lpj if notsc is passed
authorAlok Kataria <akataria@vmware.com>
Fri, 7 Nov 2008 00:08:46 +0000 (00:08 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 13 Nov 2008 17:55:58 +0000 (09:55 -0800)
commitc17e612bc777ee07543e076ebb149b8a71fc1217
treeb4f2a37d00c94494d52a47573ec431c79aaf3c77
parentf654ba2b551cecdb3cb4293c40a0e05f033564df
x86: don't use tsc_khz to calculate lpj if notsc is passed

commit 70de9a97049e0ba79dc040868564408d5ce697f9 upstream

Impact: fix udelay when "notsc" boot parameter is passed

With notsc passed on commandline, tsc may not be used for
udelays, make sure that we do not use tsc_khz to calculate
the lpj value in such cases.

Reported-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Alok N Kataria <akataria@vmware.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/x86/kernel/tsc.c