From c169859d6dfc7471ef9f2dbd720936e17906a084 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Wed, 2 May 2007 19:27:12 +0200
Subject: [PATCH] [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>
---
 arch/x86_64/kernel/Makefile                        |  2 +-
 .../asm-x86_64/bugs.h => arch/x86_64/kernel/bugs.c | 10 +++----
 include/asm-x86_64/alternative.h                   |  1 +
 include/asm-x86_64/bugs.h                          | 34 ++++------------------
 4 files changed, 13 insertions(+), 34 deletions(-)
 copy include/asm-x86_64/bugs.h => arch/x86_64/kernel/bugs.c (74%)
 rewrite include/asm-x86_64/bugs.h (99%)

diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index 6879b4f01e8..a613e13d0e7 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -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
diff --git a/include/asm-x86_64/bugs.h b/arch/x86_64/kernel/bugs.c
similarity index 74%
copy from include/asm-x86_64/bugs.h
copy to arch/x86_64/kernel/bugs.c
index d86c5dd689f..131e541e3f7 100644
--- a/include/asm-x86_64/bugs.h
+++ b/arch/x86_64/kernel/bugs.c
@@ -1,5 +1,5 @@
 /*
- *  include/asm-x86_64/bugs.h
+ *  arch/x86_64/kernel/bugs.c
  *
  *  Copyright (C) 1994  Linus Torvalds
  *  Copyright (C) 2000  SuSE
@@ -10,19 +10,19 @@
  *	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>
 
-extern void alternative_instructions(void);
-
-static void __init check_bugs(void)
+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(); 
+	alternative_instructions();
 }
diff --git a/include/asm-x86_64/alternative.h b/include/asm-x86_64/alternative.h
index a6657b4f3e0..67ebea3cc48 100644
--- a/include/asm-x86_64/alternative.h
+++ b/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;
diff --git a/include/asm-x86_64/bugs.h b/include/asm-x86_64/bugs.h
dissimilarity index 99%
index d86c5dd689f..b33dc04d8f4 100644
--- a/include/asm-x86_64/bugs.h
+++ b/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);
- */
-
-#include <asm/processor.h>
-#include <asm/i387.h>
-#include <asm/msr.h>
-#include <asm/pda.h>
-
-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(); 
-}
+#ifndef _ASM_X86_64_BUGS_H
+#define _ASM_X86_64_BUGS_H
+
+void check_bugs(void);
+
+#endif	/* _ASM_X86_64_BUGS_H */
-- 
2.11.4.GIT