lkml.org 
[lkml]   [2007]   [Apr]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [14/26] x86_64: Clean up asm-x86_64/bugs.h
    Date

    From: Jeremy Fitzhardinge <jeremy@goop.org>
    Most of asm-x86_64/bugs.h is code which should be in a C file, so put it there.

    Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
    Signed-off-by: Andi Kleen <ak@suse.de>
    Cc: Andi Kleen <ak@suse.de>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>

    ---
    arch/x86_64/kernel/Makefile | 3 ++-
    arch/x86_64/kernel/bugs.c | 28 ++++++++++++++++++++++++++++
    include/asm-x86_64/alternative.h | 1 +
    include/asm-x86_64/bugs.h | 30 ++++--------------------------
    4 files changed, 35 insertions(+), 27 deletions(-)

    ===================================================================
    Index: linux/arch/x86_64/kernel/Makefile
    ===================================================================
    --- linux.orig/arch/x86_64/kernel/Makefile
    +++ linux/arch/x86_64/kernel/Makefile
    @@ -8,7 +8,8 @@ obj-y := process.o signal.o entry.o trap
    ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \
    x8664_ksyms.o i387.o syscall.o vsyscall.o \
    setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
    - pci-dma.o pci-nommu.o alternative.o hpet.o tsc.o sched-clock.o
    + pci-dma.o pci-nommu.o alternative.o hpet.o tsc.o sched-clock.o \
    + bugs.o

    obj-$(CONFIG_STACKTRACE) += stacktrace.o
    obj-$(CONFIG_X86_MCE) += mce.o therm_throt.o
    Index: linux/arch/x86_64/kernel/bugs.c
    ===================================================================
    --- /dev/null
    +++ linux/arch/x86_64/kernel/bugs.c
    @@ -0,0 +1,28 @@
    +/*
    + * arch/x86_64/kernel/bugs.c
    + *
    + * Copyright (C) 1994 Linus Torvalds
    + * Copyright (C) 2000 SuSE
    + *
    + * This is included by init/main.c to check for architecture-dependent bugs.
    + *
    + * Needs:
    + * void check_bugs(void);
    + */
    +
    +#include <linux/kernel.h>
    +#include <asm/alternative.h>
    +#include <asm/processor.h>
    +#include <asm/i387.h>
    +#include <asm/msr.h>
    +#include <asm/pda.h>
    +
    +void __init check_bugs(void)
    +{
    + identify_cpu(&boot_cpu_data);
    +#if !defined(CONFIG_SMP)
    + printk("CPU: ");
    + print_cpu_info(&boot_cpu_data);
    +#endif
    + alternative_instructions();
    +}
    Index: linux/include/asm-x86_64/alternative.h
    ===================================================================
    --- linux.orig/include/asm-x86_64/alternative.h
    +++ linux/include/asm-x86_64/alternative.h
    @@ -16,6 +16,7 @@ struct alt_instr {
    u8 pad[5];
    };

    +extern void alternative_instructions(void);
    extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end);

    struct module;
    Index: linux/include/asm-x86_64/bugs.h
    ===================================================================
    --- linux.orig/include/asm-x86_64/bugs.h
    +++ linux/include/asm-x86_64/bugs.h
    @@ -1,28 +1,6 @@
    -/*
    - * include/asm-x86_64/bugs.h
    - *
    - * Copyright (C) 1994 Linus Torvalds
    - * Copyright (C) 2000 SuSE
    - *
    - * This is included by init/main.c to check for architecture-dependent bugs.
    - *
    - * Needs:
    - * void check_bugs(void);
    - */
    +#ifndef _ASM_X86_64_BUGS_H
    +#define _ASM_X86_64_BUGS_H

    -#include <asm/processor.h>
    -#include <asm/i387.h>
    -#include <asm/msr.h>
    -#include <asm/pda.h>
    +void check_bugs(void);

    -extern void alternative_instructions(void);
    -
    -static void __init check_bugs(void)
    -{
    - identify_cpu(&boot_cpu_data);
    -#if !defined(CONFIG_SMP)
    - printk("CPU: ");
    - print_cpu_info(&boot_cpu_data);
    -#endif
    - alternative_instructions();
    -}
    +#endif /* _ASM_X86_64_BUGS_H */
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-04-30 01:53    [W:0.025 / U:3.044 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site