Skip to contentSkip to conversation

x86 fixes for 2.6.36-rc7

GIT PULL H. Peter Anvin 1 participant 1 message Oct 1, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi Linus,

The following changes since commit 18ffe4b18cef097f789d3ff43b45f2938cebe241:

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (2010-10-01 10:58:31 -0700)

are available in the git repository at:

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

H. Peter Anvin (1):
x86, cpu: After uncapping CPUID, re-run CPU feature detection

Thomas Gleixner (2):
x86, irq: Plug memory leak in sparse irq x86, hpet: Fix bogus error check in hpet_assign_irq()

 arch/x86/kernel/apic/io_apic.c |   11 ++++++++---
 arch/x86/kernel/cpu/common.c   |    2 +-
 arch/x86/kernel/cpu/cpu.h      |    1 +
 arch/x86/kernel/cpu/intel.c    |    1 +
 arch/x86/kernel/hpet.c         |    2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)
arch/x86/kernel/apic/io_apic.c +8 -3
index f1efeba..5c5b8f3 100644
@@ -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)
arch/x86/kernel/cpu/common.c +1 -1
index 490dac6..f2f9ac7 100644
@@ -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;
arch/x86/kernel/cpu/cpu.h +1 -0
index 3624e8a..f668bb1 100644
@@ -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
arch/x86/kernel/cpu/intel.c +1 -0
index 85f69cd..b438944 100644
@@ -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);
 		}
 	}
 
arch/x86/kernel/hpet.c +1 -1
index 410fdb3..7494999 100644
@@ -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;