mirror of https://gitee.com/openkylin/linux.git
x86: move mmconfig declarations to header
arch/x86/kernel/mmconf-fam10h_64.c is missing the prototypes, which are decalred in arch/x86/kernel/setup_64.c. Move the prototypes and the inline stubs to the appropriate header file. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
1beee8dc8c
commit
d364319b98
|
@ -12,6 +12,7 @@
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/msr.h>
|
#include <asm/msr.h>
|
||||||
#include <asm/acpi.h>
|
#include <asm/acpi.h>
|
||||||
|
#include <asm/mmconfig.h>
|
||||||
|
|
||||||
#include "../pci/pci.h"
|
#include "../pci/pci.h"
|
||||||
|
|
||||||
|
|
|
@ -71,6 +71,7 @@
|
||||||
#include <asm/topology.h>
|
#include <asm/topology.h>
|
||||||
#include <asm/trampoline.h>
|
#include <asm/trampoline.h>
|
||||||
#include <asm/pat.h>
|
#include <asm/pat.h>
|
||||||
|
#include <asm/mmconfig.h>
|
||||||
|
|
||||||
#include <mach_apic.h>
|
#include <mach_apic.h>
|
||||||
#ifdef CONFIG_PARAVIRT
|
#ifdef CONFIG_PARAVIRT
|
||||||
|
@ -293,18 +294,6 @@ static void __init parse_setup_data(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PCI_MMCONFIG
|
|
||||||
extern void __cpuinit fam10h_check_enable_mmcfg(void);
|
|
||||||
extern void __init check_enable_amd_mmconf_dmi(void);
|
|
||||||
#else
|
|
||||||
void __cpuinit fam10h_check_enable_mmcfg(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
void __init check_enable_amd_mmconf_dmi(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* setup_arch - architecture-specific boot-time initializations
|
* setup_arch - architecture-specific boot-time initializations
|
||||||
*
|
*
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
#ifndef _ASM_MMCONFIG_H
|
||||||
|
#define _ASM_MMCONFIG_H
|
||||||
|
|
||||||
|
#ifdef CONFIG_PCI_MMCONFIG
|
||||||
|
extern void __cpuinit fam10h_check_enable_mmcfg(void);
|
||||||
|
extern void __init check_enable_amd_mmconf_dmi(void);
|
||||||
|
#else
|
||||||
|
static inline void fam10h_check_enable_mmcfg(void) { }
|
||||||
|
static inline void check_enable_amd_mmconf_dmi(void) { }
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in New Issue