Commit 23c0e4a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/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
parents 3a57a788 3a677d21

arch/ia64/kernel/setup.c

+2 −1
Original line number Diff line number Diff line
@@ -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

arch/ia64/kernel/time.c

+1 −0
Original line number Diff line number Diff line
@@ -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