lkml.org 
[lkml]   [2003]   [Jan]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH] OProfile Pentium IV support
    John Levon wrote:
    >
    > This is a compile-tested-only port of Graydon Hoare's driver. Please
    > give it a test and report back.

    Below is a fix to make the kernel build when it is configured for
    something other than a p4.

    > http://www.movement.uklinux.net/oprofile-0.5cvs.tar.gz

    $./configure
    ...
    checking for ld... ld
    checking for kernel OProfile support... no
    checking for kernel version... 2.5.54
    configure: error: Unsupported kernel version




    arch/i386/oprofile/Makefile | 3 ++-
    arch/i386/oprofile/nmi_int.c | 8 ++++----
    2 files changed, 6 insertions(+), 5 deletions(-)

    --- linux-hype/arch/i386/oprofile/Makefile~op4-fix Wed Jan 8 19:12:38 2003
    +++ linux-hype-akpm/arch/i386/oprofile/Makefile Wed Jan 8 19:12:38 2003
    @@ -7,4 +7,5 @@ DRIVER_OBJS = $(addprefix ../../../drive

    oprofile-y := $(DRIVER_OBJS) init.o timer_int.o
    oprofile-$(CONFIG_X86_LOCAL_APIC) += nmi_int.o op_model_athlon.o \
    - op_model_ppro.o op_model_p4.o
    + op_model_ppro.o
    +oprofile-$(CONFIG_MPENTIUM4) += op_model_p4.o
    --- linux-hype/arch/i386/oprofile/nmi_int.c~op4-fix Wed Jan 8 19:12:38 2003
    +++ linux-hype-akpm/arch/i386/oprofile/nmi_int.c Wed Jan 8 19:12:38 2003
    @@ -215,7 +215,7 @@ struct oprofile_operations nmi_ops = {
    };


    -#ifndef CONFIG_X86_64
    +#if !defined(CONFIG_X86_64) && defined(CONFIG_MPENTIUM4)

    static int __init p4_init(enum oprofile_cpu * cpu)
    {
    @@ -263,7 +263,7 @@ static int __init ppro_init(enum oprofil
    return 1;
    }

    -#endif /* CONFIG_X86_64 */
    +#endif

    int __init nmi_init(struct oprofile_operations ** ops, enum oprofile_cpu * cpu)
    {
    @@ -282,7 +282,7 @@ int __init nmi_init(struct oprofile_oper
    *cpu = OPROFILE_CPU_ATHLON;
    break;

    -#ifndef CONFIG_X86_64
    +#if !defined(CONFIG_X86_64) && defined(CONFIG_MPENTIUM4)
    case X86_VENDOR_INTEL:
    switch (family) {
    /* Pentium IV */
    @@ -301,7 +301,7 @@ int __init nmi_init(struct oprofile_oper
    return 0;
    }
    break;
    -#endif /* CONFIG_X86_64 */
    +#endif

    default:
    return 0;
    _
    -
    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: 2005-03-22 13:32    [W:0.023 / U:29.760 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site