Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f3c30e6 authored by Joachim Deguara's avatar Joachim Deguara Committed by Andi Kleen
Browse files

[PATCH] i386: check capability 



Currently the i386 architecture checks the family for mce capability and this
removes that and uses the CPUID information.  Tested on a K8 revE and a
family10h processor.

This eliminates checking of a set AMD procesor family if mce is
allowed and relies on the information being in CPUID.

Signed-off-by: default avatarJoachim Deguara <joachim.deguara@amd.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 1bdae458

arch/i386/kernel/cpu/mcheck/k7.c

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ void amd_mcheck_init(struct cpuinfo_x86 *c) 
	machine_check_vector = k7_machine_check;

	wmb();



	if (!cpu_has(c, X86_FEATURE_MCE))

		return;



	printk (KERN_INFO "Intel machine check architecture supported.\n");

	rdmsr (MSR_IA32_MCG_CAP, l, h);

	if (l & (1<<8))	/* Control register present ? */

arch/i386/kernel/cpu/mcheck/mce.c

+1 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ void mcheck_init(struct cpuinfo_x86 *c) 


	switch (c->x86_vendor) {

		case X86_VENDOR_AMD:

			if (c->x86==6 || c->x86==15)

			amd_mcheck_init(c);

			break;