lkml.org 
[lkml]   [2008]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 8/9] [PATCH] x86: change naming of cpu_initialized_mask for xen
    Date
    xen does not use the global cpu_initialized mask, but rather,
    a specific one. So we change its name so it won't conflict with the upcoming
    movement of cpu_initialized_mask from smp_64.h to smp_32.h.

    Signed-off-by: Glauber Costa <gcosta@redhat.com>
    CC: Jeremy Fitzhardinge <jeremy@goop.org>
    ---
    arch/x86/xen/smp.c | 6 +++---
    1 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
    index 6b3c37b..92dd3db 100644
    --- a/arch/x86/xen/smp.c
    +++ b/arch/x86/xen/smp.c
    @@ -35,7 +35,7 @@
    #include "xen-ops.h"
    #include "mmu.h"

    -static cpumask_t cpu_initialized_map;
    +static cpumask_t xen_cpu_initialized_map;
    static DEFINE_PER_CPU(int, resched_irq) = -1;
    static DEFINE_PER_CPU(int, callfunc_irq) = -1;
    static DEFINE_PER_CPU(int, debug_irq) = -1;
    @@ -189,7 +189,7 @@ void __init xen_smp_prepare_cpus(unsigned int max_cpus)
    if (xen_smp_intr_init(0))
    BUG();

    - cpu_initialized_map = cpumask_of_cpu(0);
    + xen_cpu_initialized_map = cpumask_of_cpu(0);

    /* Restrict the possible_map according to max_cpus. */
    while ((num_possible_cpus() > 1) && (num_possible_cpus() > max_cpus)) {
    @@ -220,7 +220,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
    struct vcpu_guest_context *ctxt;
    struct gdt_page *gdt = &per_cpu(gdt_page, cpu);

    - if (cpu_test_and_set(cpu, cpu_initialized_map))
    + if (cpu_test_and_set(cpu, xen_cpu_initialized_map))
    return 0;

    ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL);
    --
    1.5.0.6


    \
     
     \ /
      Last update: 2008-03-27 18:13    [W:0.046 / U:0.752 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site