lkml.org 
[lkml]   [2010]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 3.5/9] x86: Use local variable to cache smp_processor_id() in setup_local_APIC()
    This is a trivial clean up.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Yinghai Lu <yinghai@kernel.org>
    ---
    Separated out from patch 4 as suggested by Yinghai Lu.

    Thanks.

    arch/x86/kernel/apic/apic.c | 13 ++++++-------
    1 file changed, 6 insertions(+), 7 deletions(-)

    Index: work/arch/x86/kernel/apic/apic.c
    ===================================================================
    --- work.orig/arch/x86/kernel/apic/apic.c
    +++ work/arch/x86/kernel/apic/apic.c
    @@ -1202,6 +1202,7 @@ static void __cpuinit lapic_setup_esr(vo
    */
    void __cpuinit setup_local_APIC(void)
    {
    + int cpu = smp_processor_id();
    unsigned int value, queued;
    int i, j, acked = 0;
    unsigned long long tsc = 0, ntsc;
    @@ -1343,21 +1344,19 @@ void __cpuinit setup_local_APIC(void)
    * TODO: set up through-local-APIC from through-I/O-APIC? --macro
    */
    value = apic_read(APIC_LVT0) & APIC_LVT_MASKED;
    - if (!smp_processor_id() && (pic_mode || !value)) {
    + if (!cpu && (pic_mode || !value)) {
    value = APIC_DM_EXTINT;
    - apic_printk(APIC_VERBOSE, "enabled ExtINT on CPU#%d\n",
    - smp_processor_id());
    + apic_printk(APIC_VERBOSE, "enabled ExtINT on CPU#%d\n", cpu);
    } else {
    value = APIC_DM_EXTINT | APIC_LVT_MASKED;
    - apic_printk(APIC_VERBOSE, "masked ExtINT on CPU#%d\n",
    - smp_processor_id());
    + apic_printk(APIC_VERBOSE, "masked ExtINT on CPU#%d\n", cpu);
    }
    apic_write(APIC_LVT0, value);

    /*
    * only the BP should see the LINT1 NMI signal, obviously.
    */
    - if (!smp_processor_id())
    + if (!cpu)
    value = APIC_DM_NMI;
    else
    value = APIC_DM_NMI | APIC_LVT_MASKED;
    @@ -1369,7 +1368,7 @@ void __cpuinit setup_local_APIC(void)

    #ifdef CONFIG_X86_MCE_INTEL
    /* Recheck CMCI information after local APIC is up on CPU #0 */
    - if (smp_processor_id() == 0)
    + if (cpu == 0)
    cmci_recheck();
    #endif
    }

    \
     
     \ /
      Last update: 2010-11-12 11:35    [W:0.024 / U:244.504 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site