x86: merge header in amd_64.c
Singed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
@@ -1,11 +1,19 @@
|
|||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/bitops.h>
|
#include <linux/bitops.h>
|
||||||
#include <linux/mm.h>
|
#include <linux/mm.h>
|
||||||
|
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/processor.h>
|
#include <asm/processor.h>
|
||||||
#include <asm/apic.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 <mach_apic.h>
|
||||||
|
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -1,9 +1,16 @@
|
|||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
|
#include <linux/bitops.h>
|
||||||
#include <linux/mm.h>
|
#include <linux/mm.h>
|
||||||
|
|
||||||
#include <asm/numa_64.h>
|
#include <asm/io.h>
|
||||||
#include <asm/mmconfig.h>
|
#include <asm/processor.h>
|
||||||
#include <asm/cacheflush.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 <mach_apic.h>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user