lkml.org 
[lkml]   [2009]   [Jan]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/12] x86: Only compile setup_percpu.o on SMP
    Date
    Impact: Minor build optimization

    Signed-off-by: Brian Gerst <brgerst@gmail.com>
    ---
    arch/x86/kernel/Makefile | 3 ++-
    arch/x86/kernel/setup_percpu.c | 6 ------
    2 files changed, 2 insertions(+), 7 deletions(-)

    diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
    index a99437c..73de055 100644
    --- a/arch/x86/kernel/Makefile
    +++ b/arch/x86/kernel/Makefile
    @@ -28,7 +28,7 @@ CFLAGS_paravirt.o := $(nostackp)
    obj-y := process_$(BITS).o signal.o entry_$(BITS).o
    obj-y += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o
    obj-y += time_$(BITS).o ioport.o ldt.o dumpstack.o
    -obj-y += setup.o i8259.o irqinit_$(BITS).o setup_percpu.o
    +obj-y += setup.o i8259.o irqinit_$(BITS).o
    obj-$(CONFIG_X86_VISWS) += visws_quirks.o
    obj-$(CONFIG_X86_32) += probe_roms_32.o
    obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
    @@ -59,6 +59,7 @@ apm-y := apm_32.o
    obj-$(CONFIG_APM) += apm.o
    obj-$(CONFIG_X86_SMP) += smp.o
    obj-$(CONFIG_X86_SMP) += smpboot.o tsc_sync.o ipi.o
    +obj-$(CONFIG_SMP) += setup_percpu.o
    obj-$(CONFIG_X86_32_SMP) += smpcommon.o
    obj-$(CONFIG_X86_64_SMP) += tsc_sync.o smpcommon.o
    obj-$(CONFIG_X86_TRAMPOLINE) += trampoline_$(BITS).o
    diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
    index d367996..f30ff69 100644
    --- a/arch/x86/kernel/setup_percpu.c
    +++ b/arch/x86/kernel/setup_percpu.c
    @@ -22,14 +22,8 @@
    # define DBG(x...)
    #endif

    -/*
    - * Could be inside CONFIG_HAVE_SETUP_PER_CPU_AREA with other stuff but
    - * voyager wants cpu_number too.
    - */
    -#ifdef CONFIG_SMP
    DEFINE_PER_CPU(int, cpu_number);
    EXPORT_PER_CPU_SYMBOL(cpu_number);
    -#endif

    #ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA

    --
    1.6.1


    \
     
     \ /
      Last update: 2009-01-26 07:21    [W:0.020 / U:29.908 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site