lkml.org 
[lkml]   [2005]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[2.6 patch] i386/x86_64 mpparse.c: kill maxcpus
    Do we really need a global variable that does only hold the value of 
    NR_CPUS?

    Signed-off-by: Adrian Bunk <bunk@stusta.de>

    ---

    arch/i386/kernel/mpparse.c | 7 +++----
    arch/i386/mach-visws/mpparse.c | 6 ++----
    arch/x86_64/kernel/mpparse.c | 7 +++----
    3 files changed, 8 insertions(+), 12 deletions(-)

    --- linux-2.6.11-mm4-full/arch/i386/kernel/mpparse.c.old 2005-03-20 19:54:21.000000000 +0100
    +++ linux-2.6.11-mm4-full/arch/i386/kernel/mpparse.c 2005-03-20 19:56:17.000000000 +0100
    @@ -37,7 +37,6 @@

    /* Have we found an MP table */
    int smp_found_config;
    -unsigned int __initdata maxcpus = NR_CPUS;

    /*
    * Various Linux-internal data structures created from the
    @@ -189,9 +188,9 @@
    return;
    }

    - if (num_processors >= maxcpus) {
    - printk(KERN_WARNING "WARNING: maxcpus limit of %i reached."
    - " Processor ignored.\n", maxcpus);
    + if (num_processors >= NR_CPUS) {
    + printk(KERN_WARNING "WARNING: NR_CPUS limit of %i reached."
    + " Processor ignored.\n", NR_CPUS);
    return;
    }
    num_processors++;
    --- linux-2.6.11-mm4-full/arch/i386/mach-visws/mpparse.c.old 2005-03-20 19:56:31.000000000 +0100
    +++ linux-2.6.11-mm4-full/arch/i386/mach-visws/mpparse.c 2005-03-20 19:57:03.000000000 +0100
    @@ -28,8 +28,6 @@
    /* Bitmask of physically existing CPUs */
    physid_mask_t phys_cpu_present_map;

    -unsigned int __initdata maxcpus = NR_CPUS;
    -
    /*
    * The Visual Workstation is Intel MP compliant in the hardware
    * sense, but it doesn't have a BIOS(-configuration table).
    @@ -90,8 +88,8 @@
    ncpus = CO_CPU_MAX;
    }

    - if (ncpus > maxcpus)
    - ncpus = maxcpus;
    + if (ncpus > NR_CPUS)
    + ncpus = NR_CPUS;

    smp_found_config = 1;
    while (ncpus--)
    --- linux-2.6.11-mm4-full/arch/x86_64/kernel/mpparse.c.old 2005-03-20 19:58:45.000000000 +0100
    +++ linux-2.6.11-mm4-full/arch/x86_64/kernel/mpparse.c 2005-03-20 19:59:04.000000000 +0100
    @@ -33,7 +33,6 @@

    /* Have we found an MP table */
    int smp_found_config;
    -unsigned int __initdata maxcpus = NR_CPUS;

    int acpi_found_madt;

    @@ -126,9 +125,9 @@
    " Processor ignored.\n", NR_CPUS);
    return;
    }
    - if (num_processors >= maxcpus) {
    - printk(KERN_WARNING "WARNING: maxcpus limit of %i reached."
    - " Processor ignored.\n", maxcpus);
    + if (num_processors >= NR_CPUS) {
    + printk(KERN_WARNING "WARNING: NR_CPUS limit of %i reached."
    + " Processor ignored.\n", NR_CPUS);
    return;
    }

    -
    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 14:11    [W:0.021 / U:1.680 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site