2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Willy Tarreau <[email protected]> Initial stable commit : 2215d91091c465fd58da7814d1c10e09ac2d8307 This patch backported into 2.6.32.55 is enabled when CONFIG_AMD_NB is set, but this config option does not exist in 2.6.32, it was called CONFIG_K8_NB, so the fix was never applied. Some other changes were needed to make it work. first, the correct include file name was asm/k8.h and not asm/amd_nb.h, and second, amd_get_mmconfig_range() is needed and was merged by previous patch. Thanks to Jiri Slabi who reported the issue and diagnosed all the dependencies. Signed-off-by: Willy Tarreau <[email protected]> Cc: Jiri Slaby <[email protected]> Cc: Bjorn Helgaas <[email protected]> Cc: Jesse Barnes <[email protected]> --- arch/x86/pci/amd_bus.c | 1 + drivers/pnp/quirks.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c index cb34763..aae9931 100644 --- a/arch/x86/pci/amd_bus.c +++ b/arch/x86/pci/amd_bus.c @@ -3,6 +3,7 @@ #include <linux/topology.h> #include <linux/cpu.h> #include <asm/pci_x86.h> +#include <asm/k8.h> #ifdef CONFIG_X86_64 #include <asm/pci-direct.h> diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c index eb39d26..253996c 100644 --- a/drivers/pnp/quirks.c +++ b/drivers/pnp/quirks.c @@ -300,9 +300,9 @@ static void quirk_system_pci_resources(struct pnp_dev *dev) } } -#ifdef CONFIG_AMD_NB +#ifdef CONFIG_K8_NB -#include <asm/amd_nb.h> +#include <asm/k8.h> static void quirk_amd_mmconfig_area(struct pnp_dev *dev) { @@ -366,7 +366,7 @@ static struct pnp_fixup pnp_fixups[] = { /* PnP resources that might overlap PCI BARs */ {"PNP0c01", quirk_system_pci_resources}, {"PNP0c02", quirk_system_pci_resources}, -#ifdef CONFIG_AMD_NB +#ifdef CONFIG_K8_NB {"PNP0c01", quirk_amd_mmconfig_area}, #endif {""} -- 1.7.2.1.45.g54fbc -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
