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

Commit 0a4599c8 authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files

[PATCH] x86: Enable NMI watchdog for AMD Family 0x10 CPUs 



For i386/x86-64.

Straight forward -- just reuse the Family 0xf code.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent f790cd30

arch/i386/kernel/nmi.c

+4 −2
Original line number Diff line number Diff line
@@ -185,7 +185,8 @@ static __cpuinit inline int nmi_known_cpu(void) 
{

	switch (boot_cpu_data.x86_vendor) {

	case X86_VENDOR_AMD:

		return ((boot_cpu_data.x86 == 15) || (boot_cpu_data.x86 == 6));

		return ((boot_cpu_data.x86 == 15) || (boot_cpu_data.x86 == 6)

			|| (boot_cpu_data.x86 == 16));

	case X86_VENDOR_INTEL:

		if (cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON))

			return 1;
@@ -817,7 +818,8 @@ void setup_apic_nmi_watchdog (void *unused) 
	if (nmi_watchdog == NMI_LOCAL_APIC) {

		switch (boot_cpu_data.x86_vendor) {

		case X86_VENDOR_AMD:

			if (boot_cpu_data.x86 != 6 && boot_cpu_data.x86 != 15)

			if (boot_cpu_data.x86 != 6 && boot_cpu_data.x86 != 15 &&

				boot_cpu_data.x86 != 16)

				return;

			if (!setup_k7_watchdog())

				return;

arch/x86_64/kernel/nmi.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static __cpuinit inline int nmi_known_cpu(void) 
{

	switch (boot_cpu_data.x86_vendor) {

	case X86_VENDOR_AMD:

		return boot_cpu_data.x86 == 15;

		return boot_cpu_data.x86 == 15 || boot_cpu_data.x86 == 16;

	case X86_VENDOR_INTEL:

		if (cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON))

			return 1;