Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

torvalds · torvalds · commit f4a3330d76b1 · 2010-10-01T15:02:41.000-07:00
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, hpet: Fix bogus error check in hpet_assign_irq()
  x86, irq: Plug memory leak in sparse irq
  x86, cpu: After uncapping CPUID, re-run CPU feature detection
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
@@ -306,14 +306,19 @@ void arch_init_copy_chip_data(struct irq_desc *old_desc,
 
 	old_cfg = old_desc->chip_data;
 
-	memcpy(cfg, old_cfg, sizeof(struct irq_cfg));
+	cfg->vector = old_cfg->vector;
+	cfg->move_in_progress = old_cfg->move_in_progress;
+	cpumask_copy(cfg->domain, old_cfg->domain);
+	cpumask_copy(cfg->old_domain, old_cfg->old_domain);
 
 	init_copy_irq_2_pin(old_cfg, cfg, node);
 }
 
-static void free_irq_cfg(struct irq_cfg *old_cfg)
+static void free_irq_cfg(struct irq_cfg *cfg)
 {
-	kfree(old_cfg);
+	free_cpumask_var(cfg->domain);
+	free_cpumask_var(cfg->old_domain);
+	kfree(cfg);
 }
 
 void arch_free_chip_data(struct irq_desc *old_desc, struct irq_desc *desc)
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
@@ -545,7 +545,7 @@ void __cpuinit cpu_detect(struct cpuinfo_x86 *c)
 	}
 }
 
-static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)
+void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)
 {
 	u32 tfms, xlvl;
 	u32 ebx;
diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h
@@ -33,5 +33,6 @@ extern const struct cpu_dev *const __x86_cpu_dev_start[],
 			    *const __x86_cpu_dev_end[];
 
 extern void cpu_detect_cache_sizes(struct cpuinfo_x86 *c);
+extern void get_cpu_cap(struct cpuinfo_x86 *c);
 
 #endif
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
@@ -39,6 +39,7 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
 			misc_enable &= ~MSR_IA32_MISC_ENABLE_LIMIT_CPUID;
 			wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
 			c->cpuid_level = cpuid_eax(0);
+			get_cpu_cap(c);
 		}
 	}
 
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
@@ -506,7 +506,7 @@ static int hpet_assign_irq(struct hpet_dev *dev)
 {
 	unsigned int irq;
 
-	irq = create_irq();
+	irq = create_irq_nr(0, -1);
 	if (!irq)
 		return -EINVAL;
 

Original file line number	Diff line number	Diff line change
`@@ -306,14 +306,19 @@ void arch_init_copy_chip_data(struct irq_desc *old_desc,`
`306`	`306`
`307`	`307`	`old_cfg = old_desc->chip_data;`
`308`	`308`
`309`		`- memcpy(cfg, old_cfg, sizeof(struct irq_cfg));`
	`309`	`+ cfg->vector = old_cfg->vector;`
	`310`	`+ cfg->move_in_progress = old_cfg->move_in_progress;`
	`311`	`+ cpumask_copy(cfg->domain, old_cfg->domain);`
	`312`	`+ cpumask_copy(cfg->old_domain, old_cfg->old_domain);`
`310`	`313`
`311`	`314`	`init_copy_irq_2_pin(old_cfg, cfg, node);`
`312`	`315`	`}`
`313`	`316`
`314`		`-static void free_irq_cfg(struct irq_cfg *old_cfg)`
	`317`	`+static void free_irq_cfg(struct irq_cfg *cfg)`
`315`	`318`	`{`
`316`		`- kfree(old_cfg);`
	`319`	`+ free_cpumask_var(cfg->domain);`
	`320`	`+ free_cpumask_var(cfg->old_domain);`
	`321`	`+ kfree(cfg);`
`317`	`322`	`}`
`318`	`323`
`319`	`324`	`void arch_free_chip_data(struct irq_desc old_desc, struct irq_desc desc)`
Original file line number	Diff line number	Diff line change
`@@ -545,7 +545,7 @@ void __cpuinit cpu_detect(struct cpuinfo_x86 *c)`
`545`	`545`	`}`
`546`	`546`	`}`
`547`	`547`
`548`		`-static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)`
	`548`	`+void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)`
`549`	`549`	`{`
`550`	`550`	`u32 tfms, xlvl;`
`551`	`551`	`u32 ebx;`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)`
`39`	`39`	`misc_enable &= ~MSR_IA32_MISC_ENABLE_LIMIT_CPUID;`
`40`	`40`	`wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable);`
`41`	`41`	`c->cpuid_level = cpuid_eax(0);`
	`42`	`+ get_cpu_cap(c);`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`
Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ static int hpet_assign_irq(struct hpet_dev *dev)`
`506`	`506`	`{`
`507`	`507`	`unsigned int irq;`
`508`	`508`
`509`		`- irq = create_irq();`
	`509`	`+ irq = create_irq_nr(0, -1);`
`510`	`510`	`if (!irq)`
`511`	`511`	`return -EINVAL;`
`512`	`512`