lkml.org 
[lkml]   [2008]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH x86] [11/16] Compile apm and voyager module only when selected in Kconfig
    Date

    Previously the complete files were #ifdef'ed, but now handle that in the
    Makefile.

    May save a minor bit of compilation time.

    Cc: hpa@rpath.com

    Signed-off-by: Andi Kleen <ak@suse.de>

    ---
    arch/x86/Kconfig | 5 +++++
    arch/x86/boot/Makefile | 6 ++++--
    arch/x86/boot/apm.c | 3 ---
    arch/x86/boot/voyager.c | 4 ----
    4 files changed, 9 insertions(+), 9 deletions(-)

    Index: linux/arch/x86/Kconfig
    ===================================================================
    --- linux.orig/arch/x86/Kconfig
    +++ linux/arch/x86/Kconfig
    @@ -1219,6 +1219,11 @@ source "kernel/power/Kconfig"

    source "drivers/acpi/Kconfig"

    +config X86_APM_BOOT
    + bool
    + default y
    + depends on APM
    +
    menuconfig APM
    tristate "APM (Advanced Power Management) BIOS support"
    depends on X86_32 && PM_SLEEP && !X86_VISWS
    Index: linux/arch/x86/boot/Makefile
    ===================================================================
    --- linux.orig/arch/x86/boot/Makefile
    +++ linux/arch/x86/boot/Makefile
    @@ -28,9 +28,11 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA
    targets := vmlinux.bin setup.bin setup.elf zImage bzImage
    subdir- := compressed

    -setup-y += a20.o apm.o cmdline.o copy.o cpu.o cpucheck.o edd.o
    +setup-y += a20.o cmdline.o copy.o cpu.o cpucheck.o edd.o
    setup-y += header.o main.o mca.o memory.o pm.o pmjump.o
    -setup-y += printf.o string.o tty.o video.o version.o voyager.o
    +setup-y += printf.o string.o tty.o video.o version.o
    +setup-$(CONFIG_X86_APM_BOOT) += apm.o
    +setup-$(CONFIG_X86_VOYAGER) += voyager.o

    # The link order of the video-*.o modules can matter. In particular,
    # video-vga.o *must* be listed first, followed by video-vesa.o.
    Index: linux/arch/x86/boot/apm.c
    ===================================================================
    --- linux.orig/arch/x86/boot/apm.c
    +++ linux/arch/x86/boot/apm.c
    @@ -19,8 +19,6 @@

    #include "boot.h"

    -#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
    -
    int query_apm_bios(void)
    {
    u16 ax, bx, cx, dx, di;
    @@ -95,4 +93,3 @@ int query_apm_bios(void)
    return 0;
    }

    -#endif
    Index: linux/arch/x86/boot/voyager.c
    ===================================================================
    --- linux.orig/arch/x86/boot/voyager.c
    +++ linux/arch/x86/boot/voyager.c
    @@ -16,8 +16,6 @@

    #include "boot.h"

    -#ifdef CONFIG_X86_VOYAGER
    -
    int query_voyager(void)
    {
    u8 err;
    @@ -42,5 +40,3 @@ int query_voyager(void)
    copy_from_fs(data_ptr, di, 7); /* Table is 7 bytes apparently */
    return 0;
    }
    -
    -#endif /* CONFIG_X86_VOYAGER */

    \
     
     \ /
      Last update: 2008-01-03 16:49    [W:0.021 / U:89.316 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site