diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-09-07 17:58:53 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-08 15:32:01 +0200 |
| commit | 8d71a2ea0ad4ef9b9076ffd44726bad1f0ccf59b (patch) | |
| tree | 5a952f766602ca54a916f3659bcc72a5c99ffcfb /arch | |
| parent | 2b86473604f6e9aef0b5e89c56798a90ccddcdbe (diff) | |
| download | blackbird-op-linux-8d71a2ea0ad4ef9b9076ffd44726bad1f0ccf59b.tar.gz blackbird-op-linux-8d71a2ea0ad4ef9b9076ffd44726bad1f0ccf59b.zip | |
x86: merge header in amd_64.c
Singed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/amd.c | 8 | ||||
| -rw-r--r-- | 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 a3a9e3cbdea9..3c8090d10053 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 20c3f12dfe78..1d83601e85ef 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> |
