[PATCH] OProfile: correct CPU type for x86-64

From: John Levon (levon_at_movementarian.org)
Date: 08/31/03

  • Next message: Chris Frey: "Re: Andrea VM changes" 
    Date:	Sun, 31 Aug 2003 20:19:37 +0100
To: torvalds@osdl.org, linux-kernel@vger.kernel.org

    Enable the Hammer specific events by giving the correct cpu string.
    From, and tested by, Will Cohen.

    diff -Naur -X dontdiff linux-cvs/arch/i386/oprofile/nmi_int.c linux-fixes/arch/i386/oprofile/nmi_int.c
    --- linux-cvs/arch/i386/oprofile/nmi_int.c 2003-08-29 16:56:24.000000000 +0100
    +++ linux-fixes/arch/i386/oprofile/nmi_int.c 2003-08-29 17:02:20.000000000 +0100
    @@ -364,10 +364,21 @@
             switch (vendor) {
                     case X86_VENDOR_AMD:
                             /* Needs to be at least an Athlon (or hammer in 32bit mode) */
    - if (family < 6)
    +
    + switch (family) {
    + default:
                                     return -ENODEV;
    - model = &op_athlon_spec;
    - nmi_ops.cpu_type = "i386/athlon";
    + case 6:
    + model = &op_athlon_spec;
    + nmi_ops.cpu_type = "i386/athlon";
    + break;
    +#if defined(CONFIG_X86_64)
    + case 0xf:
    + model = &op_athlon_spec;
    + nmi_ops.cpu_type = "x86-64/hammer";
    + break;
    +#endif /* CONFIG_X86_64 */
    + }
                             break;
      
     #if !defined(CONFIG_X86_64)
    -
    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/

  • Next message: Chris Frey: "Re: Andrea VM changes"

    Relevant Pages