[4/4] [2.6 patch] better i386 CPU selection

From: Adrian Bunk (bunk_at_fs.tum.de)
Date: 09/25/03

  • Next message: Steven Dake: "Re: [PATCH} fix defect with kobject memory leaks during del_gendisk" 
    Date:	Thu, 25 Sep 2003 20:06:49 +0200
To: linux-kernel@vger.kernel.org

    - make arch/i386/kernel/cpu/mtrr/Makefile CPU specific

    diffstat output:

     arch/i386/kernel/cpu/mtrr/Makefile | 14 ++++++++++----
     arch/i386/kernel/cpu/mtrr/main.c | 14 ++++++++++++++
     2 files changed, 24 insertions(+), 4 deletions(-)

    --- linux-2.6.0-test5-cpu/arch/i386/kernel/cpu/mtrr/Makefile.old 2003-09-13 11:25:27.000000000 +0200
    +++ linux-2.6.0-test5-cpu/arch/i386/kernel/cpu/mtrr/Makefile 2003-09-13 14:14:20.000000000 +0200
    @@ -1,5 +1,11 @@
    -obj-y := main.o if.o generic.o state.o
    -obj-y += amd.o
    -obj-y += cyrix.o
    -obj-y += centaur.o
    +obj-y := main.o if.o generic.o state.o
    +
    +obj-$(CONFIG_CPU_K6) += amd.o
    +
    +obj-$(CONFIG_CPU_586) += cyrix.o
    +
    +obj-$(CONFIG_CPU_WINCHIP) += centaur.o
    +obj-$(CONFIG_CPU_CYRIXIII) += centaur.o
    +obj-$(CONFIG_CPU_VIAC3_2) += centaur.o
    +
     
    --- linux-2.6.0-test5-cpu/arch/i386/kernel/cpu/mtrr/main.c.old 2003-09-13 14:04:35.000000000 +0200
    +++ linux-2.6.0-test5-cpu/arch/i386/kernel/cpu/mtrr/main.c 2003-09-13 14:09:11.000000000 +0200
    @@ -475,12 +475,16 @@
                     printk(KERN_WARNING "mtrr: register: %d too big\n", reg);
                     goto out;
             }
    +
    +#if defined(CONFIG_CPU_586)
             if (is_cpu(CYRIX) && !use_intel()) {
                     if ((reg == 3) && arr3_protected) {
                             printk(KERN_WARNING "mtrr: ARR3 cannot be changed\n");
                             goto out;
                     }
             }
    +#endif
    +
             mtrr_if->get(reg, &lbase, &lsize, &ltype);
             if (lsize < 1) {
                     printk(KERN_WARNING "mtrr: MTRR %d not used\n", reg);
    @@ -536,9 +540,19 @@
     
     static void __init init_ifs(void)
     {
    +
    +#if defined(CONFIG_CPU_K6)
             amd_init_mtrr();
    +#endif
    +
    +#if defined(CONFIG_CPU_586)
             cyrix_init_mtrr();
    +#endif
    +
    +#if defined(CONFIG_CPU_WINCHIP) || defined(CONFIG_CPU_CYRIXIII) || defined(CONFIG_CPU_VIAC3_2)
             centaur_init_mtrr();
    +#endif
    +
     }
     
     static void init_other_cpus(void)

    -
    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: Steven Dake: "Re: [PATCH} fix defect with kobject memory leaks during del_gendisk"

    Relevant Pages