[PATCH 4/9] x86: merge header in amd/64.c

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Yinghai Lu
Date: Sunday, September 7, 2008 - 5:58 pm

Singed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
---
 arch/x86/kernel/cpu/amd.c    |    8 ++++++++
 arch/x86/kernel/cpu/amd_64.c |   13 ++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index a3a9e3c..3c8090d 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -1,11 +1,19 @@
 #include <linux/init.h>
 #include <linux/bitops.h>
 #include <linux/mm.h>
+
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/apic.h>
 
+#ifdef CONFIG_X86_64
+# include <asm/numa_64.h>
+# include <asm/mmconfig.h>
+# include <asm/cacheflush.h>
+#endif
+
 #include <mach_apic.h>
+
 #include "cpu.h"
 
 /*
diff --git a/arch/x86/kernel/cpu/amd_64.c b/arch/x86/kernel/cpu/amd_64.c
index 20c3f12..1d83601 100644
--- a/arch/x86/kernel/cpu/amd_64.c
+++ b/arch/x86/kernel/cpu/amd_64.c
@@ -1,9 +1,16 @@
 #include <linux/init.h>
+#include <linux/bitops.h>
 #include <linux/mm.h>
 
-#include <asm/numa_64.h>
-#include <asm/mmconfig.h>
-#include <asm/cacheflush.h>
+#include <asm/io.h>
+#include <asm/processor.h>
+#include <asm/apic.h>
+
+#ifdef CONFIG_X86_64
+# include <asm/numa_64.h>
+# include <asm/mmconfig.h>
+# include <asm/cacheflush.h>
+#endif
 
 #include <mach_apic.h>
 
-- 
1.5.4.5

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 2/9] x86: remove duplicated force_mwait, Yinghai Lu, (Sun Sep 7, 5:58 pm)
[PATCH 3/9] x86: add srat_detect_node for amd64, Yinghai Lu, (Sun Sep 7, 5:58 pm)
[PATCH 4/9] x86: merge header in amd/64.c, Yinghai Lu, (Sun Sep 7, 5:58 pm)
[PATCH 5/9] x86: make amd.c have 64bit support code, Yinghai Lu, (Sun Sep 7, 5:58 pm)
[PATCH 6/9] x86: make amd_64 have 32 bit code, Yinghai Lu, (Sun Sep 7, 5:58 pm)
[PATCH 7/9] x86: make 64 bit to use amd.c, Yinghai Lu, (Sun Sep 7, 5:58 pm)
[PATCH 9/9] x86: little clean up intel.c/intel_64.c, Yinghai Lu, (Sun Sep 7, 5:58 pm)
Re: [PATCH 7/9] x86: make 64 bit to use amd.c, Ingo Molnar, (Mon Sep 8, 6:33 am)