Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c169859d authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Andi Kleen
Browse files

[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: default avatarJeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
parent 1dbf527c

arch/x86_64/kernel/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -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 \

		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 \

		x8664_ksyms.o i387.o syscall.o vsyscall.o \

		setup64.o bootflag.o e820.o reboot.o quirks.o i8237.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_STACKTRACE)	+= stacktrace.o

obj-$(CONFIG_X86_MCE)		+= mce.o therm_throt.o

obj-$(CONFIG_X86_MCE)		+= mce.o therm_throt.o

arch/x86_64/kernel/bugs.c

0 → 100644
+28 −0
Original line number Original line Diff line number Diff line 
/*

 *  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();

}

include/asm-x86_64/alternative.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ struct alt_instr { 
	u8  pad[5];

	u8  pad[5];

};

};





extern void alternative_instructions(void);

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

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





struct module;

struct module;

include/asm-x86_64/bugs.h

+4 −26
Original line number Original line Diff line number Diff line 
/*

#ifndef _ASM_X86_64_BUGS_H

 *  include/asm-x86_64/bugs.h

#define _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);

 */





#include <asm/processor.h>

void check_bugs(void);

#include <asm/i387.h>

#include <asm/msr.h>

#include <asm/pda.h>





extern void alternative_instructions(void);

#endif	/* _ASM_X86_64_BUGS_H */
 


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

}