Commit 9e26d842 authored by Robert Richter's avatar Robert Richter Committed by Ingo Molnar
Browse files

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



Also much less code now.

Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d44b9d17

arch/x86/kernel/cpu/amd.c

+0 −2
Original line number Diff line number Diff line
@@ -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"



/*

arch/x86/kernel/cpu/amd_64.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

arch/x86/kernel/cpu/cpu.h

+5 −0
Original line number Diff line number Diff line 
#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);

arch/x86/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/x86/kernel/setup.h

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/*

 * 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 */