OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] x86-64: Clean up asm-x86_64/bugs.h 

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>
This commit is contained in:
Jeremy Fitzhardinge 2007-05-02 19:27:12 +02:00 committed by Andi Kleen
parent 1dbf527c51
commit c169859d6d
4 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86_64/kernel/Makefile
View File

@ -8,7 +8,7 @@ obj-y := process.o signal.o entry.o traps.o irq.o \
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
pci-dma.o pci-nommu.o alternative.o hpet.o tsc.o bugs.o
obj-$(CONFIG_STACKTRACE) += stacktrace.o
obj-$(CONFIG_X86_MCE) += mce.o therm_throt.o

28
arch/x86_64/kernel/bugs.c Normal file
View File

@ -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();
}

1
include/asm-x86_64/alternative.h
View File

@ -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;

30
include/asm-x86_64/bugs.h
View File

@ -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 */