lkml.org 
[lkml]   [2007]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH x86 for review III] [19/29] x86: Enable NMI watchdog for AMD Family 0x10 CPUs
    Date

    For i386/x86-64.

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

    Signed-off-by: Andi Kleen <ak@suse.de>

    ---
    arch/i386/kernel/nmi.c | 6 ++++--
    arch/x86_64/kernel/nmi.c | 2 +-
    2 files changed, 5 insertions(+), 3 deletions(-)
    Index: linux/arch/i386/kernel/nmi.c
    ===================================================================
    --- linux.orig/arch/i386/kernel/nmi.c
    +++ linux/arch/i386/kernel/nmi.c
    @@ -185,7 +185,8 @@ static __cpuinit inline int nmi_known_cp
    {
    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 *unus
    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;
    Index: linux/arch/x86_64/kernel/nmi.c
    ===================================================================
    --- linux.orig/arch/x86_64/kernel/nmi.c
    +++ linux/arch/x86_64/kernel/nmi.c
    @@ -172,7 +172,7 @@ static __cpuinit inline int nmi_known_cp
    {
    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;
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-02-12 18:01    [W:0.418 / U:0.044 seconds]
    ©2003-2014 Jasper Spaans. Advertise on this site