aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-18 11:25:28 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-18 11:25:28 -0400
commit939e3428066962b7c5966d8f9648058e644f5395 (patch)
tree3718307b41dbc9428f618e6b2c3f10ba42877c75
parentbfea13d4a127aab4c10085b6f9b6e2ff4f023f79 (diff)
parent03983ab858ae6aea273060277c9b290498340047 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix sched_clock() et al.
-rw-r--r--arch/sparc64/kernel/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index 6b9a06e42542..2d63d7689962 100644
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -1030,7 +1030,7 @@ void __devinit setup_sparc64_timer(void)
1030 clockevents_register_device(sevt); 1030 clockevents_register_device(sevt);
1031} 1031}
1032 1032
1033#define SPARC64_NSEC_PER_CYC_SHIFT 32UL 1033#define SPARC64_NSEC_PER_CYC_SHIFT 10UL
1034 1034
1035static struct clocksource clocksource_tick = { 1035static struct clocksource clocksource_tick = {
1036 .rating = 100, 1036 .rating = 100,