AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

fix build bug in "x86: add PCI extended config space access for AMD Barcelona"

Browse Source 
Also much less code now.

Signed-off-by: Robert Richter <robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Robert Richter 2008-06-06 12:01:13 +02:00 committed by Ingo Molnar
parent d44b9d17fa
commit 9e26d84273
7 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/cpu/amd.c
View File

@ -4,10 +4,8 @@
#include <asm/io.h>
#include <asm/processor.h>
#include <asm/apic.h>
#include <asm/mmconfig.h>
#include <mach_apic.h>
#include "../setup.h"
#include "cpu.h"
/*

1
arch/x86/kernel/cpu/amd_64.c
View File

@ -6,6 +6,7 @@
#include <asm/cacheflush.h>
#include <mach_apic.h>
#include "cpu.h"
extern int __cpuinit get_model_name(struct cpuinfo_x86 *c);
extern void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c);

5
arch/x86/kernel/cpu/cpu.h
View File

@ -1,3 +1,4 @@
#ifdef CONFIG_X86_32
struct cpu_model_info {
int vendor;
@ -36,3 +37,7 @@ extern struct cpu_vendor_dev __x86cpuvendor_start[], __x86cpuvendor_end[];
extern int get_model_name(struct cpuinfo_x86 *c);
extern void display_cacheinfo(struct cpuinfo_x86 *c);
#endif /* CONFIG_X86_32 */
extern void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c);

2
arch/x86/kernel/setup.c
View File

@ -136,6 +136,7 @@ void __init setup_per_cpu_areas(void)
setup_cpumask_of_cpu();
}
#endif
#define ENABLE_CF8_EXT_CFG (1ULL << 46)
void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c)
@ -149,4 +150,3 @@ void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c)
set_cpu_cap(c, X86_FEATURE_PCI_EXT_CFG);
}
#endif

26
arch/x86/kernel/setup.h
View File

@ -1,26 +0,0 @@
/*
* Internal declarations for shared x86 setup code.
*
* Copyright (c) 2008 Advanced Micro Devices, Inc.
* Contributed by Robert Richter <robert.richter@amd.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
* License as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
*/
#ifndef _ARCH_X86_KERNEL_SETUP_H
extern void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c);
#endif /* _ARCH_X86_KERNEL_SETUP_H */

2
arch/x86/kernel/setup_64.c
View File

@ -73,8 +73,6 @@
#include <asm/pat.h>
#include <asm/mmconfig.h>
#include "setup.h"
#include <mach_apic.h>
#ifdef CONFIG_PARAVIRT
#include <asm/paravirt.h>

6
include/asm-x86/mmconfig.h
View File

@ -9,10 +9,4 @@ static inline void fam10h_check_enable_mmcfg(void) { }
static inline void check_enable_amd_mmconf_dmi(void) { }
#endif
#if defined(CONFIG_SMP) && defined(CONFIG_X86_64)
extern void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c);
#else
static inline void amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c) { }
#endif
#endif