From: H. Peter Anvin <hpa@linux.intel.com> Date: Mon, 14 Jan 2013 04:56:41 +0000 (-0800) Subject: x86/Sandy Bridge: Sandy Bridge workaround depends on CONFIG_PCI X-Git-Tag: firefly_0821_release~7541^2~52 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d997f40c116cdb098e09f0a140501ffc42b5184e;p=firefly-linux-kernel-4.4.55.git x86/Sandy Bridge: Sandy Bridge workaround depends on CONFIG_PCI commit e43b3cec711a61edf047adf6204d542f3a659ef8 upstream. early_pci_allowed() and read_pci_config_16() are only available if CONFIG_PCI is defined. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Abdallah Chatila <abdallah.chatila@ericsson.com> --- diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index eb9eb8be17de..6c4e9ffc290c 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -633,6 +633,7 @@ static unsigned reserve_low = CONFIG_X86_RESERVE_LOW << 10; static bool __init snb_gfx_workaround_needed(void) { +#ifdef CONFIG_PCI int i; u16 vendor, devid; static const u16 snb_ids[] = { @@ -657,6 +658,7 @@ static bool __init snb_gfx_workaround_needed(void) for (i = 0; i < ARRAY_SIZE(snb_ids); i++) if (devid == snb_ids[i]) return true; +#endif return false; }