]> err.no Git - linux-2.6/commit
x86: merge sched_clock handling
authorAlok Kataria <akataria@vmware.com>
Tue, 1 Jul 2008 18:43:18 +0000 (11:43 -0700)
committerIngo Molnar <mingo@elte.hu>
Wed, 9 Jul 2008 05:43:25 +0000 (07:43 +0200)
commit0ef95533326a7b37d16025af9edc0c18e644b346
tree216e53f744b9bd718c4f54862032c241bf59fd73
parent746f2eb790e75676ddc3b816ba18bac4179cc744
x86: merge sched_clock handling

Move the basic global variable definitions and sched_clock handling in the
common "tsc.c" file.

 - Unify notsc kernel command line handling for 32 bit and 64bit.
 - Functional changes for 64bit.
        - "tsc_disabled" is updated if "notsc" is passed at boottime.
        - Fallback to jiffies for sched_clock, incase notsc is passed on
  commandline.

Signed-off-by: Alok N Kataria <akataria@vmware.com>
Signed-off-by: Dan Hecht <dhecht@vmware.com>
Cc: Dan Hecht <dhecht@vmware.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/Makefile
arch/x86/kernel/time_32.c
arch/x86/kernel/tsc.c [new file with mode: 0644]
arch/x86/kernel/tsc_32.c
arch/x86/kernel/tsc_64.c