浏览代码

[PATCH] x86_64: mark two routines as __cpuinit

SIgned-off-by: Shaohua Li<shaohua.li@intel.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Shaohua Li 19 年之前
父节点
当前提交
396bd50fed
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      arch/x86_64/kernel/apic.c
  2. 1 1
      arch/x86_64/kernel/time.c

+ 1 - 1
arch/x86_64/kernel/apic.c

@@ -937,7 +937,7 @@ void smp_apic_timer_interrupt(struct pt_regs *regs)
  * multi-chassis. Use available data to take a good guess.
  * multi-chassis. Use available data to take a good guess.
  * If in doubt, go HPET.
  * If in doubt, go HPET.
  */
  */
-__init int oem_force_hpet_timer(void)
+__cpuinit int oem_force_hpet_timer(void)
 {
 {
 	int i, clusters, zeros;
 	int i, clusters, zeros;
 	unsigned id;
 	unsigned id;

+ 1 - 1
arch/x86_64/kernel/time.c

@@ -963,7 +963,7 @@ void __init time_init(void)
  * Make an educated guess if the TSC is trustworthy and synchronized
  * Make an educated guess if the TSC is trustworthy and synchronized
  * over all CPUs.
  * over all CPUs.
  */
  */
-__init int unsynchronized_tsc(void)
+__cpuinit int unsynchronized_tsc(void)
 {
 {
 #ifdef CONFIG_SMP
 #ifdef CONFIG_SMP
 	if (oem_force_hpet_timer())
 	if (oem_force_hpet_timer())