Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3b69915deee81842ba192c251573141ac3af86db
Commit: 3b69915deee81842ba192c251573141ac3af86db
Parent: 4f1124c5bcc5e0b139930d98687db80fd4d67a1c
Author: Thomas Gleixner <[EMAIL PROTECTED]>
AuthorDate: Thu Oct 11 11:14:44 2007 +0200
Committer: Thomas Gleixner <[EMAIL PROTECTED]>
CommitDate: Thu Oct 11 11:14:44 2007 +0200
x86_64: prepare shared kernel/bugs.c
Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
---
arch/x86_64/kernel/Makefile | 2 +-
arch/x86_64/kernel/bugs.c | 24 ------------------------
arch/x86_64/kernel/bugs_64.c | 24 ++++++++++++++++++++++++
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index c6c9eb2..a6b3ea5 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -8,7 +8,7 @@ obj-y := process.o signal_64.o entry.o traps_64.o irq.o \
ptrace.o time.o ioport_64.o ldt.o setup_64.o i8259_64.o
sys_x86_64.o \
x8664_ksyms.o i387_64.o syscall.o vsyscall_64.o \
setup64.o bootflag.o e820_64.o reboot.o quirks.o i8237.o \
- pci-dma_64.o pci-nommu_64.o alternative.o hpet_64.o tsc.o
bugs.o \
+ pci-dma_64.o pci-nommu_64.o alternative.o hpet_64.o tsc.o
bugs_64.o \
perfctr-watchdog.o
obj-$(CONFIG_STACKTRACE) += stacktrace.o
diff --git a/arch/x86_64/kernel/bugs.c b/arch/x86_64/kernel/bugs.c
deleted file mode 100644
index 4e5e9d3..0000000
--- a/arch/x86_64/kernel/bugs.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * arch/x86_64/kernel/bugs.c
- *
- * Copyright (C) 1994 Linus Torvalds
- * Copyright (C) 2000 SuSE
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <asm/alternative.h>
-#include <asm/bugs.h>
-#include <asm/processor.h>
-#include <asm/mtrr.h>
-
-void __init check_bugs(void)
-{
- identify_cpu(&boot_cpu_data);
- mtrr_bp_init();
-#if !defined(CONFIG_SMP)
- printk("CPU: ");
- print_cpu_info(&boot_cpu_data);
-#endif
- alternative_instructions();
-}
diff --git a/arch/x86_64/kernel/bugs_64.c b/arch/x86_64/kernel/bugs_64.c
new file mode 100644
index 0000000..4e5e9d3
--- /dev/null
+++ b/arch/x86_64/kernel/bugs_64.c
@@ -0,0 +1,24 @@
+/*
+ * arch/x86_64/kernel/bugs.c
+ *
+ * Copyright (C) 1994 Linus Torvalds
+ * Copyright (C) 2000 SuSE
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <asm/alternative.h>
+#include <asm/bugs.h>
+#include <asm/processor.h>
+#include <asm/mtrr.h>
+
+void __init check_bugs(void)
+{
+ identify_cpu(&boot_cpu_data);
+ mtrr_bp_init();
+#if !defined(CONFIG_SMP)
+ printk("CPU: ");
+ print_cpu_info(&boot_cpu_data);
+#endif
+ alternative_instructions();
+}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
