x86: export cpu_llc_id for edac drivers
PATCH 1/1 x86: export cpu_llc_id for edac drivers
When I compiled today's Linus tree, I got a link error from drivers/edac/edac_mce_amd.c:408, it complained about not finding symbol 'per_cpu__cpu_llc_id'. This is due to we don't export 'cpu_llc_id'.
This patch fixes it.
---
arch/x86/kernel/smpboot.c +1 -0
@@ -99,6 +99,7 @@ EXPORT_SYMBOL(smp_num_siblings);/* Last level cache ID of each logical CPU */ DEFINE_PER_CPU (u16, cpu_llc_id) =BAD_APICID ; +EXPORT_PER_CPU_SYMBOL (cpu_llc_id);/* representing HT siblings of each logical CPU */ DEFINE_PER_CPU (cpumask_var_t, cpu_sibling_map);
Heh.. was about to send out the same patch.
Quoted 7 lines · Amerigo Wang
When I compiled today's Linus tree, I got a link error from
drivers/edac/edac_mce_amd.c:408, it complained about not finding symbol 'per_cpu__cpu_llc_id'. This is due to we don't export 'cpu_llc_id'.This patch fixes it.
Quoted 8 lines
Signed-off-by WANG Cong <[email protected]>Cc H. Peter Anvin <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Yinghai Lu <[email protected]>Cc Rusty Russell <[email protected]>Cc Tejun Heo <[email protected]>Cc Mike Travis <[email protected]>
Thanks.
Signature · 1 line
tejun
Quoted 1 line · Tejun Heo
Heh.. was about to send out the same patch.
Maybe a better fix would be to provide a wrapper for this. See attached patch.
Regards,
Andreas
---
x86, edac: Provide function to return NodeId for CPU
arch/x86/include/asm/processor.h +2 -0
@@ -1020,4 +1020,6 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,extern int get_tsc_mode (unsigned long adr);extern int set_tsc_mode (unsigned int val); +extern int amd_get_nb_id (int cpu); +#endif /* _ASM_X86_PROCESSOR_H */
arch/x86/kernel/cpu/amd.c +10 -0
@@ -333,6 +333,16 @@ static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c)#endif } +int amd_get_nb_id (int cpu) +{ +int id =0 ; +#ifdef CONFIG_SMP + id =per_cpu (cpu_llc_id, cpu); +#endif +return id; +} +EXPORT_SYMBOL_GPL (amd_get_nb_id); +static void __cpuinit srat_detect_node (struct cpuinfo_x86 *c) {#if defined(CONFIG_NUMA ) && defined(CONFIG_X86_64 )
drivers/edac/edac_mce_amd.c +1 -1
@@ -405,7 +405,7 @@ void decode_mce(struct mce *m) regs.nbsh = (u32)(m->status >>32 ); regs.nbeal = (u32 ) m->addr; regs.nbeah = (u32)(m->addr >>32 ); - node =per_cpu (cpu_llc_id, m->extcpu); + node =amd_get_nb_id (m->extcpu);amd_decode_nb_mce (node, ®s,1 );break ;
Amerigo Wang
Reviewed-byQuoted 6 lines · Andreas Herrmann
Quoted 1 line · Tejun Heo
Heh.. was about to send out the same patch.
Maybe a better fix would be to provide a wrapper for this. See attached patch.
Agreed.
Quoted 8 lines
Regards,
Andreas---
x86, edac: Provide function to return NodeId for CPUSigned-off-by Andreas Herrmann <[email protected]>
Thanks.
Quoted 47 lines
arch/x86/include/asm/processor.h +2
-0@@ -1020,4 +1020,6 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,extern int get_tsc_mode (unsigned long adr);extern int set_tsc_mode (unsigned int val); +extern int amd_get_nb_id (int cpu); +#endif /* _ASM_X86_PROCESSOR_H */ arch/x86/kernel/cpu/amd.c +10
-0@@ -333,6 +333,16 @@ static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c)#endif } +int amd_get_nb_id (int cpu) +{ +int id =0 ; +#ifdef CONFIG_SMP + id =per_cpu (cpu_llc_id, cpu); +#endif +return id; +} +EXPORT_SYMBOL_GPL (amd_get_nb_id); +static void __cpuinit srat_detect_node (struct cpuinfo_x86 *c) {#if defined(CONFIG_NUMA ) && defined(CONFIG_X86_64 )drivers/edac/edac_mce_amd.c +1
-1@@ -405,7 +405,7 @@ void decode_mce(struct mce *m) regs.nbsh = (u32)(m->status >>32 ); regs.nbeal = (u32 ) m->addr; regs.nbeah = (u32)(m->addr >>32 ); - node =per_cpu (cpu_llc_id, m->extcpu); + node =amd_get_nb_id (m->extcpu);amd_decode_nb_mce (node, ®s,1 );break ;