Skip to content

L
linux-davinci
Commit 939e3428 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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.
parents bfea13d4 03983ab8
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
arch/sparc64/kernel/time.c
View file @ 939e3428
...@@ -1030,7 +1030,7 @@ void __devinit setup_sparc64_timer(void) ...@@ -1030,7 +1030,7 @@ void __devinit setup_sparc64_timer(void)
clockevents_register_device(sevt); clockevents_register_device(sevt);
} }
#define SPARC64_NSEC_PER_CYC_SHIFT 32UL #define SPARC64_NSEC_PER_CYC_SHIFT 10UL
static struct clocksource clocksource_tick = { static struct clocksource clocksource_tick = {
.rating = 100, .rating = 100,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment