diff options
Diffstat (limited to 'arch/x86_64/kernel/setup.c')
-rw-r--r-- | arch/x86_64/kernel/setup.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 000015dd5a8b..ca9a915a6d4a 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c | |||
@@ -676,7 +676,7 @@ void __init setup_arch(char **cmdline_p) | |||
676 | #endif | 676 | #endif |
677 | } | 677 | } |
678 | 678 | ||
679 | static int __init get_model_name(struct cpuinfo_x86 *c) | 679 | static int __cpuinit get_model_name(struct cpuinfo_x86 *c) |
680 | { | 680 | { |
681 | unsigned int *v; | 681 | unsigned int *v; |
682 | 682 | ||
@@ -692,7 +692,7 @@ static int __init get_model_name(struct cpuinfo_x86 *c) | |||
692 | } | 692 | } |
693 | 693 | ||
694 | 694 | ||
695 | static void __init display_cacheinfo(struct cpuinfo_x86 *c) | 695 | static void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) |
696 | { | 696 | { |
697 | unsigned int n, dummy, eax, ebx, ecx, edx; | 697 | unsigned int n, dummy, eax, ebx, ecx, edx; |
698 | 698 | ||
@@ -803,7 +803,7 @@ static int __init init_amd(struct cpuinfo_x86 *c) | |||
803 | return r; | 803 | return r; |
804 | } | 804 | } |
805 | 805 | ||
806 | static void __init detect_ht(struct cpuinfo_x86 *c) | 806 | static void __cpuinit detect_ht(struct cpuinfo_x86 *c) |
807 | { | 807 | { |
808 | #ifdef CONFIG_SMP | 808 | #ifdef CONFIG_SMP |
809 | u32 eax, ebx, ecx, edx; | 809 | u32 eax, ebx, ecx, edx; |
@@ -864,7 +864,7 @@ static void __init detect_ht(struct cpuinfo_x86 *c) | |||
864 | /* | 864 | /* |
865 | * find out the number of processor cores on the die | 865 | * find out the number of processor cores on the die |
866 | */ | 866 | */ |
867 | static int __init intel_num_cpu_cores(struct cpuinfo_x86 *c) | 867 | static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c) |
868 | { | 868 | { |
869 | unsigned int eax; | 869 | unsigned int eax; |
870 | 870 | ||
@@ -882,7 +882,7 @@ static int __init intel_num_cpu_cores(struct cpuinfo_x86 *c) | |||
882 | return 1; | 882 | return 1; |
883 | } | 883 | } |
884 | 884 | ||
885 | static void __init init_intel(struct cpuinfo_x86 *c) | 885 | static void __cpuinit init_intel(struct cpuinfo_x86 *c) |
886 | { | 886 | { |
887 | /* Cache sizes */ | 887 | /* Cache sizes */ |
888 | unsigned n; | 888 | unsigned n; |
@@ -902,7 +902,7 @@ static void __init init_intel(struct cpuinfo_x86 *c) | |||
902 | c->x86_num_cores = intel_num_cpu_cores(c); | 902 | c->x86_num_cores = intel_num_cpu_cores(c); |
903 | } | 903 | } |
904 | 904 | ||
905 | void __init get_cpu_vendor(struct cpuinfo_x86 *c) | 905 | void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c) |
906 | { | 906 | { |
907 | char *v = c->x86_vendor_id; | 907 | char *v = c->x86_vendor_id; |
908 | 908 | ||
@@ -923,7 +923,7 @@ struct cpu_model_info { | |||
923 | /* Do some early cpuid on the boot CPU to get some parameter that are | 923 | /* Do some early cpuid on the boot CPU to get some parameter that are |
924 | needed before check_bugs. Everything advanced is in identify_cpu | 924 | needed before check_bugs. Everything advanced is in identify_cpu |
925 | below. */ | 925 | below. */ |
926 | void __init early_identify_cpu(struct cpuinfo_x86 *c) | 926 | void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c) |
927 | { | 927 | { |
928 | u32 tfms; | 928 | u32 tfms; |
929 | 929 | ||
@@ -977,7 +977,7 @@ void __init early_identify_cpu(struct cpuinfo_x86 *c) | |||
977 | /* | 977 | /* |
978 | * This does the hard work of actually picking apart the CPU stuff... | 978 | * This does the hard work of actually picking apart the CPU stuff... |
979 | */ | 979 | */ |
980 | void __init identify_cpu(struct cpuinfo_x86 *c) | 980 | void __cpuinit identify_cpu(struct cpuinfo_x86 *c) |
981 | { | 981 | { |
982 | int i; | 982 | int i; |
983 | u32 xlvl; | 983 | u32 xlvl; |
@@ -1054,7 +1054,7 @@ void __init identify_cpu(struct cpuinfo_x86 *c) | |||
1054 | } | 1054 | } |
1055 | 1055 | ||
1056 | 1056 | ||
1057 | void __init print_cpu_info(struct cpuinfo_x86 *c) | 1057 | void __cpuinit print_cpu_info(struct cpuinfo_x86 *c) |
1058 | { | 1058 | { |
1059 | if (c->x86_model_id[0]) | 1059 | if (c->x86_model_id[0]) |
1060 | printk("%s", c->x86_model_id); | 1060 | printk("%s", c->x86_model_id); |