]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
x86, cacheinfo: Enable L3 CID only on AMD
authorBorislav Petkov <borislav.petkov@amd.com>
Thu, 18 Feb 2010 18:37:14 +0000 (19:37 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 26 Apr 2010 14:47:57 +0000 (07:47 -0700)
commitfaef0b851da169e44a842ab3b257a84857ac8f7f
treeb68de1170b89b2155e8fcd76393ec34f3c66deb9
parentf8b1a072d4f260c203eb500beb70a1e1c2ff8689
x86, cacheinfo: Enable L3 CID only on AMD

commit cb19060abfdecac0d1eb2d2f0e7d6b7a3f8bc4f4 upstream.

Final stage linking can fail with

 arch/x86/built-in.o: In function `store_cache_disable':
 intel_cacheinfo.c:(.text+0xc509): undefined reference to `amd_get_nb_id'
 arch/x86/built-in.o: In function `show_cache_disable':
 intel_cacheinfo.c:(.text+0xc7d3): undefined reference to `amd_get_nb_id'

when CONFIG_CPU_SUP_AMD is not enabled because the amd_get_nb_id
helper is defined in AMD-specific code but also used in generic code
(intel_cacheinfo.c). Reorganize the L3 cache index disable code under
CONFIG_CPU_SUP_AMD since it is AMD-only anyway.

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
LKML-Reference: <20100218184210.GF20473@aftab>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/x86/kernel/cpu/intel_cacheinfo.c