fix build bug in "x86: add PCI extended config space access for AMD Barcelona"
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 fix build bug in "x86: add PCI extended config space access for AMD Barcelona"
Signed-off-by Robert Richter <[email protected]>
--- arch/powerpc/kernel/setup_64.c | 2 -- arch/x86/kernel/cpu/amd.c | 1 - arch/x86/kernel/cpu/amd_64.c | 1 + arch/x86/kernel/setup.c | 4 ++-- include/asm-x86/mmconfig.h | 6 ------ 5 files changed, 3 insertions(+), 11 deletions(-)
arch/powerpc/kernel/setup_64.c +0 -2
@@ -62,8 +62,6 @@#include <asm/udbg.h> #include <asm/kexec.h> -#include "setup.h" -#ifdef DEBUG #define DBG(fmt...) udbg_printf(fmt)#else
arch/x86/kernel/cpu/amd.c +0 -1
@@ -4,7 +4,6 @@#include <asm/io.h> #include <asm/processor.h> #include <asm/apic.h> -#include <asm/mmconfig.h> #include <mach_apic.h> #include "../setup.h"
arch/x86/kernel/cpu/amd_64.c +1 -0
@@ -6,6 +6,7 @@#include <asm/cacheflush.h> #include <mach_apic.h> +#include "../setup.h" extern int __cpuinit get_model_name (struct cpuinfo_x86 *c);extern void __cpuinit display_cacheinfo (struct cpuinfo_x86 *c);
arch/x86/kernel/setup.c +2 -2
@@ -204,6 +204,8 @@ 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)
@@ -217,8 +219,6 @@ void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_PCI_EXT_CFG ); } -#endif -#ifdef X86_64_NUMA /*
include/asm-x86/mmconfig.h +0 -6
@@ -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
Signature · 1 line
1.5.5.1
Ingo,
Quoted 3 lines · Robert Richter
Signed-off-by Robert Richter <[email protected]>---
arch/powerpc/kernel/setup_64.c|
This patch is wrong. It touches a different setup_64.c file. Sorry for that, will send an update for tip/x86/cpu.
-Robert
Quoted 5 lines
arch/x86/kernel/cpu/amd.c | 1 - arch/x86/kernel/cpu/amd_64.c | 1 + arch/x86/kernel/setup.c | 4 ++-- include/asm-x86/mmconfig.h | 6 ------ 5 files changed, 3 insertions(+), 11 deletions(-)
PATCH 1/1 fix build bug in "x86: add PCI extended config space access for AMD Barcelona"
Signed-off-by Robert Richter <[email protected]>
--- arch/x86/kernel/cpu/amd.c | 1 - arch/x86/kernel/cpu/amd_64.c | 1 + arch/x86/kernel/setup.c | 4 ++-- arch/x86/kernel/setup_64.c | 2 -- include/asm-x86/mmconfig.h | 6 ------ 5 files changed, 3 insertions(+), 11 deletions(-)
arch/x86/kernel/cpu/amd.c +0 -1
@@ -4,7 +4,6 @@#include <asm/io.h> #include <asm/processor.h> #include <asm/apic.h> -#include <asm/mmconfig.h> #include <mach_apic.h> #include "../setup.h"
arch/x86/kernel/cpu/amd_64.c +1 -0
@@ -6,6 +6,7 @@#include <asm/cacheflush.h> #include <mach_apic.h> +#include "../setup.h" extern int __cpuinit get_model_name (struct cpuinfo_x86 *c);extern void __cpuinit display_cacheinfo (struct cpuinfo_x86 *c);
arch/x86/kernel/setup.c +2 -2
@@ -136,6 +136,8 @@ 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)
@@ -148,5 +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_64.c +0 -2
@@ -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>
include/asm-x86/mmconfig.h +0 -6
@@ -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
Signature · 1 line
1.5.5.3
include/asm-x86/mmconfig.h static inline void fam10h_check_enable_mmcfg(void) { } · line 17
Quoted 12 lines · Robert Richter
include/asm-x86/mmconfig.h +0
-6@@ -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 -
Can we please remove this superflous arch/x86/kernel/setup.h file, which has a length/content ratio of 26:1. This removes the ugly "../setup.h" includes
Thanks,
tglx
PATCH 1/1 fix build bug in "x86: add PCI extended config space access for AMD Barcelona" (try #3)
Much more less code now.
Signed-off-by Robert Richter <[email protected]>
--- arch/x86/kernel/cpu/amd.c | 2 -- arch/x86/kernel/cpu/amd_64.c | 1 + arch/x86/kernel/cpu/cpu.h | 5 +++++ arch/x86/kernel/setup.c | 4 ++-- arch/x86/kernel/setup.h | 26 -------------------------- arch/x86/kernel/setup_64.c | 2 -- include/asm-x86/mmconfig.h | 6 ------ 7 files changed, 8 insertions(+), 38 deletions(-) delete mode 100644 arch/x86/kernel/setup.h
arch/x86/kernel/cpu/amd.c +0 -2
@@ -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
@@ -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
@@ -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);
arch/x86/kernel/setup.c +2 -2
@@ -136,6 +136,8 @@ 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)
@@ -148,5 +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 deleted +0 -26
@@ -1,26 +0,0 @@ -/* -* Internal declarations for shared x86 setup code. -* -* Copyright (c) 2008 Advanced Micro Devices, Inc. -* Contributed by Robert Richter <[email protected]> -* -* 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 */
arch/x86/kernel/setup_64.c +0 -2
@@ -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>
include/asm-x86/mmconfig.h +0 -6
@@ -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
Signature · 1 line
1.5.5.3
Ingo Molnar
AppliedRe: [PATCH] fix build bug in "x86: add PCI extended config space access for AMD Barcelona" (try #3)
Quoted 3 lines · Robert Richter
Much more less code now.
Signed-off-by Robert Richter <[email protected]>
applied to tip/x86/cpu - thanks Robert.
Ingo