---

yaml --- r: 60458 b: refs/heads/master c: 3ac66e3 h: refs/heads/master v: v3
git-mirror · Jul 17, 2007 · 129b3bd · 129b3bd
1 parent 761f325
commit 129b3bd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7713a7d195c2e11d7ba6a973317da0af862d1264
+refs/heads/master: 3ac66e33eaf0b2313f7e3c8c023aa0420577a0c2
diff --git a/trunk/arch/sparc64/kernel/setup.c b/trunk/arch/sparc64/kernel/setup.c
@@ -454,9 +454,9 @@ static int show_cpuinfo(struct seq_file *m, void *__unused)
 		   ncpus_probed,
 		   num_online_cpus(),
 		   dcache_parity_tl1_occurred,
-		   icache_parity_tl1_occurred,
+		   icache_parity_tl1_occurred
 #ifndef CONFIG_SMP
-		   cpu_data(0).clock_tick
+		   , cpu_data(0).clock_tick
 #endif
 		);
 #ifdef CONFIG_SMP

diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c
@@ -1406,7 +1406,7 @@ static void migrate_hrtimers(int cpu)
 static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
 					unsigned long action, void *hcpu)
 {
-	unsigned int cpu = (long)hcpu;
+	long cpu = (long)hcpu;
 
 	switch (action) {