summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/amd.c
diff options
context:
space:
mode:
authorDaniel J Blueman <daniel@numascale-asia.com>2012-11-27 14:32:10 +0800
committerBorislav Petkov <bp@suse.de>2013-01-10 16:17:58 +0100
commit8b84c8df38d5796da2e8cd051666d203ddabcb62 (patch)
tree58a5a8f81311841c887c5c2118667a062ec7e31f /arch/x86/kernel/cpu/amd.c
parent772c3ff385eda0d0b4744596f87b79a17f8c9282 (diff)
downloadop-kernel-dev-8b84c8df38d5796da2e8cd051666d203ddabcb62.zip
op-kernel-dev-8b84c8df38d5796da2e8cd051666d203ddabcb62.tar.gz
x86, AMD, NB: Use u16 for northbridge IDs in amd_get_nb_id
Change amd_get_nb_id to return u16 to support >255 memory controllers, and related consistency fixes. Signed-off-by: Daniel J Blueman <daniel@numascale-asia.com> Link: http://lkml.kernel.org/r/1353997932-8475-2-git-send-email-daniel@numascale-asia.com Signed-off-by: Borislav Petkov <bp@alien8.de>
Diffstat (limited to 'arch/x86/kernel/cpu/amd.c')
-rw-r--r--arch/x86/kernel/cpu/amd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 15239ff..782c456 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -364,9 +364,9 @@ static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c)
#endif
}
-int amd_get_nb_id(int cpu)
+u16 amd_get_nb_id(int cpu)
{
- int id = 0;
+ u16 id = 0;
#ifdef CONFIG_SMP
id = per_cpu(cpu_llc_id, cpu);
#endif
OpenPOWER on IntegriCloud