projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
kernel
/
cpu
/
amd.c
diff --git
a/arch/x86/kernel/cpu/amd.c
b/arch/x86/kernel/cpu/amd.c
index 163af4a91d09f7cc0c24825219450caa09972f43..84bee67141ad3c376bd3927464718e0084cfdfba 100644
(file)
--- 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