Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

…it/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] export account_system_vtime [IA64] Bugfix for system with 32 cpus
git-mirror · Jul 3, 2008 · 23c0e4a · 23c0e4a
2 parents 3a57a78 + 3a677d2
commit 23c0e4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
@@ -547,7 +547,8 @@ setup_arch (char **cmdline_p)
 # ifdef CONFIG_ACPI_NUMA
 	acpi_numa_init();
 	per_cpu_scan_finalize((cpus_weight(early_cpu_possible_map) == 0 ?
-		32 : cpus_weight(early_cpu_possible_map)), additional_cpus);
+		32 : cpus_weight(early_cpu_possible_map)),
+		additional_cpus > 0 ? additional_cpus : 0);
 # endif
 #else
 # ifdef CONFIG_SMP

diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
@@ -117,6 +117,7 @@ void account_system_vtime(struct task_struct *tsk)
 
 	local_irq_restore(flags);
 }
+EXPORT_SYMBOL_GPL(account_system_vtime);
 
 /*
  * Called from the timer interrupt handler to charge accumulated user time
-Original file line number
+Diff line change
@@ Expand Up / @@ -117,6 +117,7 @@ void account_system_vtime(struct task_struct *tsk) @@
     	local_irq_restore(flags);
     }
+    EXPORT_SYMBOL_GPL(account_system_vtime);
     /*
      * Called from the timer interrupt handler to charge accumulated user time
@@ Expand Down @@