[PATCH] init call cleanup
Trival patch for CPU hotplug. In CPU identify part, only did cleaup for intel CPUs. Need do for other CPUs if they support S3 SMP. Signed-off-by: Li Shaohua<shaohua.li@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

szülő
d720803a93
commit
0bb3184df5
@@ -24,9 +24,9 @@ EXPORT_PER_CPU_SYMBOL(cpu_gdt_table);
|
||||
DEFINE_PER_CPU(unsigned char, cpu_16bit_stack[CPU_16BIT_STACK_SIZE]);
|
||||
EXPORT_PER_CPU_SYMBOL(cpu_16bit_stack);
|
||||
|
||||
static int cachesize_override __initdata = -1;
|
||||
static int disable_x86_fxsr __initdata = 0;
|
||||
static int disable_x86_serial_nr __initdata = 1;
|
||||
static int cachesize_override __devinitdata = -1;
|
||||
static int disable_x86_fxsr __devinitdata = 0;
|
||||
static int disable_x86_serial_nr __devinitdata = 1;
|
||||
|
||||
struct cpu_dev * cpu_devs[X86_VENDOR_NUM] = {};
|
||||
|
||||
@@ -59,7 +59,7 @@ static int __init cachesize_setup(char *str)
|
||||
}
|
||||
__setup("cachesize=", cachesize_setup);
|
||||
|
||||
int __init get_model_name(struct cpuinfo_x86 *c)
|
||||
int __devinit get_model_name(struct cpuinfo_x86 *c)
|
||||
{
|
||||
unsigned int *v;
|
||||
char *p, *q;
|
||||
@@ -89,7 +89,7 @@ int __init get_model_name(struct cpuinfo_x86 *c)
|
||||
}
|
||||
|
||||
|
||||
void __init display_cacheinfo(struct cpuinfo_x86 *c)
|
||||
void __devinit display_cacheinfo(struct cpuinfo_x86 *c)
|
||||
{
|
||||
unsigned int n, dummy, ecx, edx, l2size;
|
||||
|
||||
@@ -130,7 +130,7 @@ void __init display_cacheinfo(struct cpuinfo_x86 *c)
|
||||
/* in particular, if CPUID levels 0x80000002..4 are supported, this isn't used */
|
||||
|
||||
/* Look up CPU names by table lookup. */
|
||||
static char __init *table_lookup_model(struct cpuinfo_x86 *c)
|
||||
static char __devinit *table_lookup_model(struct cpuinfo_x86 *c)
|
||||
{
|
||||
struct cpu_model_info *info;
|
||||
|
||||
@@ -151,7 +151,7 @@ static char __init *table_lookup_model(struct cpuinfo_x86 *c)
|
||||
}
|
||||
|
||||
|
||||
void __init get_cpu_vendor(struct cpuinfo_x86 *c, int early)
|
||||
void __devinit get_cpu_vendor(struct cpuinfo_x86 *c, int early)
|
||||
{
|
||||
char *v = c->x86_vendor_id;
|
||||
int i;
|
||||
@@ -202,7 +202,7 @@ static inline int flag_is_changeable_p(u32 flag)
|
||||
|
||||
|
||||
/* Probe for the CPUID instruction */
|
||||
static int __init have_cpuid_p(void)
|
||||
static int __devinit have_cpuid_p(void)
|
||||
{
|
||||
return flag_is_changeable_p(X86_EFLAGS_ID);
|
||||
}
|
||||
@@ -249,7 +249,7 @@ static void __init early_cpu_detect(void)
|
||||
#endif
|
||||
}
|
||||
|
||||
void __init generic_identify(struct cpuinfo_x86 * c)
|
||||
void __devinit generic_identify(struct cpuinfo_x86 * c)
|
||||
{
|
||||
u32 tfms, xlvl;
|
||||
int junk;
|
||||
@@ -296,7 +296,7 @@ void __init generic_identify(struct cpuinfo_x86 * c)
|
||||
}
|
||||
}
|
||||
|
||||
static void __init squash_the_stupid_serial_number(struct cpuinfo_x86 *c)
|
||||
static void __devinit squash_the_stupid_serial_number(struct cpuinfo_x86 *c)
|
||||
{
|
||||
if (cpu_has(c, X86_FEATURE_PN) && disable_x86_serial_nr ) {
|
||||
/* Disable processor serial number */
|
||||
@@ -324,7 +324,7 @@ __setup("serialnumber", x86_serial_nr_setup);
|
||||
/*
|
||||
* This does the hard work of actually picking apart the CPU stuff...
|
||||
*/
|
||||
void __init identify_cpu(struct cpuinfo_x86 *c)
|
||||
void __devinit identify_cpu(struct cpuinfo_x86 *c)
|
||||
{
|
||||
int i;
|
||||
|
||||
@@ -438,7 +438,7 @@ void __init identify_cpu(struct cpuinfo_x86 *c)
|
||||
}
|
||||
|
||||
#ifdef CONFIG_X86_HT
|
||||
void __init detect_ht(struct cpuinfo_x86 *c)
|
||||
void __devinit detect_ht(struct cpuinfo_x86 *c)
|
||||
{
|
||||
u32 eax, ebx, ecx, edx;
|
||||
int index_msb, tmp;
|
||||
@@ -493,7 +493,7 @@ void __init detect_ht(struct cpuinfo_x86 *c)
|
||||
}
|
||||
#endif
|
||||
|
||||
void __init print_cpu_info(struct cpuinfo_x86 *c)
|
||||
void __devinit print_cpu_info(struct cpuinfo_x86 *c)
|
||||
{
|
||||
char *vendor = NULL;
|
||||
|
||||
@@ -516,7 +516,7 @@ void __init print_cpu_info(struct cpuinfo_x86 *c)
|
||||
printk("\n");
|
||||
}
|
||||
|
||||
cpumask_t cpu_initialized __initdata = CPU_MASK_NONE;
|
||||
cpumask_t cpu_initialized __devinitdata = CPU_MASK_NONE;
|
||||
|
||||
/* This is hacky. :)
|
||||
* We're emulating future behavior.
|
||||
@@ -563,7 +563,7 @@ void __init early_cpu_init(void)
|
||||
* and IDT. We reload them nevertheless, this function acts as a
|
||||
* 'CPU state barrier', nothing should get across.
|
||||
*/
|
||||
void __init cpu_init (void)
|
||||
void __devinit cpu_init(void)
|
||||
{
|
||||
int cpu = smp_processor_id();
|
||||
struct tss_struct * t = &per_cpu(init_tss, cpu);
|
||||
|
@@ -28,7 +28,7 @@ extern int trap_init_f00f_bug(void);
|
||||
struct movsl_mask movsl_mask;
|
||||
#endif
|
||||
|
||||
void __init early_intel_workaround(struct cpuinfo_x86 *c)
|
||||
void __devinit early_intel_workaround(struct cpuinfo_x86 *c)
|
||||
{
|
||||
if (c->x86_vendor != X86_VENDOR_INTEL)
|
||||
return;
|
||||
@@ -43,7 +43,7 @@ void __init early_intel_workaround(struct cpuinfo_x86 *c)
|
||||
* This is called before we do cpu ident work
|
||||
*/
|
||||
|
||||
int __init ppro_with_ram_bug(void)
|
||||
int __devinit ppro_with_ram_bug(void)
|
||||
{
|
||||
/* Uses data from early_cpu_detect now */
|
||||
if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL &&
|
||||
@@ -61,7 +61,7 @@ int __init ppro_with_ram_bug(void)
|
||||
* P4 Xeon errata 037 workaround.
|
||||
* Hardware prefetcher may cause stale data to be loaded into the cache.
|
||||
*/
|
||||
static void __init Intel_errata_workarounds(struct cpuinfo_x86 *c)
|
||||
static void __devinit Intel_errata_workarounds(struct cpuinfo_x86 *c)
|
||||
{
|
||||
unsigned long lo, hi;
|
||||
|
||||
@@ -80,7 +80,7 @@ static void __init Intel_errata_workarounds(struct cpuinfo_x86 *c)
|
||||
/*
|
||||
* find out the number of processor cores on the die
|
||||
*/
|
||||
static int __init num_cpu_cores(struct cpuinfo_x86 *c)
|
||||
static int __devinit num_cpu_cores(struct cpuinfo_x86 *c)
|
||||
{
|
||||
unsigned int eax;
|
||||
|
||||
@@ -98,7 +98,7 @@ static int __init num_cpu_cores(struct cpuinfo_x86 *c)
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void __init init_intel(struct cpuinfo_x86 *c)
|
||||
static void __devinit init_intel(struct cpuinfo_x86 *c)
|
||||
{
|
||||
unsigned int l2 = 0;
|
||||
char *p = NULL;
|
||||
@@ -204,7 +204,7 @@ static unsigned int intel_size_cache(struct cpuinfo_x86 * c, unsigned int size)
|
||||
return size;
|
||||
}
|
||||
|
||||
static struct cpu_dev intel_cpu_dev __initdata = {
|
||||
static struct cpu_dev intel_cpu_dev __devinitdata = {
|
||||
.c_vendor = "Intel",
|
||||
.c_ident = { "GenuineIntel" },
|
||||
.c_models = {
|
||||
|
@@ -28,7 +28,7 @@ struct _cache_table
|
||||
};
|
||||
|
||||
/* all the cache descriptor types we care about (no TLB or trace cache entries) */
|
||||
static struct _cache_table cache_table[] __initdata =
|
||||
static struct _cache_table cache_table[] __devinitdata =
|
||||
{
|
||||
{ 0x06, LVL_1_INST, 8 }, /* 4-way set assoc, 32 byte line size */
|
||||
{ 0x08, LVL_1_INST, 16 }, /* 4-way set assoc, 32 byte line size */
|
||||
@@ -160,7 +160,7 @@ static int __init find_num_cache_leaves(void)
|
||||
return retval;
|
||||
}
|
||||
|
||||
unsigned int __init init_intel_cacheinfo(struct cpuinfo_x86 *c)
|
||||
unsigned int __devinit init_intel_cacheinfo(struct cpuinfo_x86 *c)
|
||||
{
|
||||
unsigned int trace = 0, l1i = 0, l1d = 0, l2 = 0, l3 = 0; /* Cache sizes */
|
||||
unsigned int new_l1d = 0, new_l1i = 0; /* Cache sizes from cpuid(4) */
|
||||
|
@@ -31,7 +31,7 @@ static fastcall void unexpected_machine_check(struct pt_regs * regs, long error_
|
||||
void fastcall (*machine_check_vector)(struct pt_regs *, long error_code) = unexpected_machine_check;
|
||||
|
||||
/* This has to be run for each processor */
|
||||
void __init mcheck_init(struct cpuinfo_x86 *c)
|
||||
void __devinit mcheck_init(struct cpuinfo_x86 *c)
|
||||
{
|
||||
if (mce_disabled==1)
|
||||
return;
|
||||
|
@@ -29,7 +29,7 @@ static fastcall void pentium_machine_check(struct pt_regs * regs, long error_cod
|
||||
}
|
||||
|
||||
/* Set up machine check reporting for processors with Intel style MCE */
|
||||
void __init intel_p5_mcheck_init(struct cpuinfo_x86 *c)
|
||||
void __devinit intel_p5_mcheck_init(struct cpuinfo_x86 *c)
|
||||
{
|
||||
u32 l, h;
|
||||
|
||||
|
Reference in New Issue
Block a user