---

yaml --- r: 163449 b: refs/heads/master c: fc6191d h: refs/heads/master i: 163447: 986c740 v: v3
git-mirror · Aug 19, 2009 · 97ccc5c · 97ccc5c
1 parent f0916cc
commit 97ccc5c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e055d41ff5e9761c5572a6f4ce94bcd82bfbb28f
+refs/heads/master: fc6191dd301e3bc8cbb142aab1a2ec4e699cb2de
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/smp-shx3.c b/trunk/arch/sh/kernel/cpu/sh4a/smp-shx3.c
@@ -57,6 +57,8 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
 {
 	int i;
 
+	local_timer_setup(0);
+
 	BUILD_BUG_ON(SMP_MSG_NR >= 8);
 
 	for (i = 0; i < SMP_MSG_NR; i++)

diff --git a/trunk/arch/sh/kernel/localtimer.c b/trunk/arch/sh/kernel/localtimer.c
@@ -22,6 +22,7 @@
 #include <linux/jiffies.h>
 #include <linux/percpu.h>
 #include <linux/clockchips.h>
+#include <linux/hardirq.h>
 #include <linux/irq.h>
 
 static DEFINE_PER_CPU(struct clock_event_device, local_clockevent);
@@ -33,7 +34,9 @@ void local_timer_interrupt(void)
 {
 	struct clock_event_device *clk = &__get_cpu_var(local_clockevent);
 
+	irq_enter();
 	clk->event_handler(clk);
+	irq_exit();
 }
 
 static void dummy_timer_set_mode(enum clock_event_mode mode,
@@ -46,8 +49,10 @@ void __cpuinit local_timer_setup(unsigned int cpu)
 	struct clock_event_device *clk = &per_cpu(local_clockevent, cpu);
 
 	clk->name		= "dummy_timer";
-	clk->features		= CLOCK_EVT_FEAT_DUMMY;
-	clk->rating		= 200;
+	clk->features		= CLOCK_EVT_FEAT_ONESHOT |
+				  CLOCK_EVT_FEAT_PERIODIC |
+				  CLOCK_EVT_FEAT_DUMMY;
+	clk->rating		= 400;
 	clk->mult		= 1;
 	clk->set_mode		= dummy_timer_set_mode;
 	clk->broadcast		= smp_timer_broadcast;

diff --git a/trunk/arch/sh/kernel/time.c b/trunk/arch/sh/kernel/time.c
@@ -119,9 +119,5 @@ void __init time_init(void)
 	set_normalized_timespec(&wall_to_monotonic,
 				-xtime.tv_sec, -xtime.tv_nsec);
 
-#ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
-	local_timer_setup(smp_processor_id());
-#endif
-
 	late_time_init = sh_late_time_init;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,6 +57,8 @@ void __init plat_prepare_cpus(unsigned int max_cpus) @@
     {
     	int i;
+    	local_timer_setup(0);
     	BUILD_BUG_ON(SMP_MSG_NR >= 8);
     	for (i = 0; i < SMP_MSG_NR; i++)
@@ Expand Down @@