lkml.org 
[lkml]   [2008]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 57/79] [PATCH] call do_boot_cpu directly from native_cpu_up
    Date
    From: Glauber Costa <gcosta@redhat.com>

    We don't need __smp_prepare_cpu anymore.

    Signed-off-by: Glauber Costa <gcosta@redhat.com>
    ---
    arch/x86/kernel/smpboot_32.c | 21 ++++++---------------
    1 files changed, 6 insertions(+), 15 deletions(-)

    diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
    index 5165b11..4ba5ab2 100644
    --- a/arch/x86/kernel/smpboot_32.c
    +++ b/arch/x86/kernel/smpboot_32.c
    @@ -702,20 +702,6 @@ void cpu_exit_clear(void)
    }
    #endif

    -static void __cpuinit __smp_prepare_cpu(int cpu)
    -{
    - int apicid;
    -
    - apicid = per_cpu(x86_cpu_to_apicid, cpu);
    -
    - /* init low mem mapping */
    - clone_pgd_range(swapper_pg_dir, swapper_pg_dir + USER_PGD_PTRS,
    - min_t(unsigned long, KERNEL_PGD_PTRS, USER_PGD_PTRS));
    - flush_tlb_all();
    -
    - do_boot_cpu(apicid, cpu);
    -}
    -
    static int boot_cpu_logical_apicid;
    /* Where the IO area was mapped on multiquad, always 0 otherwise */
    void *xquad_portio;
    @@ -872,7 +858,12 @@ int __cpuinit native_cpu_up(unsigned int cpu)

    per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;

    - __smp_prepare_cpu(cpu);
    + /* init low mem mapping */
    + clone_pgd_range(swapper_pg_dir, swapper_pg_dir + USER_PGD_PTRS,
    + min_t(unsigned long, KERNEL_PGD_PTRS, USER_PGD_PTRS));
    + flush_tlb_all();
    +
    + do_boot_cpu(apicid, cpu);

    /* In case one didn't come up */
    if (!cpu_isset(cpu, cpu_callin_map)) {
    --
    1.5.0.6


    \
     
     \ /
      Last update: 2008-03-19 21:29    [W:0.024 / U:4.636 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site