Skip to content

Commit

Permalink
x86: move mmconfig declarations to header
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Gleixner authored and H. Peter Anvin committed May 30, 2008
1 parent 1beee8d commit d364319
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
1 change: 1 addition & 0 deletions arch/x86/kernel/mmconf-fam10h_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <asm/io.h>
#include <asm/msr.h>
#include <asm/acpi.h>
#include <asm/mmconfig.h>

#include "../pci/pci.h"

Expand Down
13 changes: 1 addition & 12 deletions arch/x86/kernel/setup_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
#include <asm/topology.h>
#include <asm/trampoline.h>
#include <asm/pat.h>
#include <asm/mmconfig.h>

#include <mach_apic.h>
#ifdef CONFIG_PARAVIRT
Expand Down Expand Up @@ -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
*
Expand Down
12 changes: 12 additions & 0 deletions include/asm-x86/mmconfig.h
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit d364319

Please sign in to comment.