Hi all,
After merging the edac tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/ras/amd/atl/umc.c: In function 'get_die_id':
drivers/ras/amd/atl/umc.c:318:44: error: implicit declaration of function 'amd_get_nodes_per_socket' [-Werror=implicit-function-declaration]
318 | return topology_die_id(err->cpu) % amd_get_nodes_per_socket();
| ^~~~~~~~~~~~~~~~~~~~~~~~
Caused by commit
3f3174996be6 ("RAS: Introduce AMD Address Translation Library")
interacting with commit
c749ce393b8f ("x86/cpu: Use common topology code for AMD")
from the tip tree.
I applied the following merge resolution patch.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 27 Feb 2024 13:22:56 +1100
Subject: [PATCH] fix up for "RAS: Introduce AMD Address Translation Library"
interacting with "x86/cpu: Use common topology code for AMD"
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/ras/amd/atl/umc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/ras/amd/atl/umc.c b/drivers/ras/amd/atl/umc.c
index 08c6dbd44c62..65a0ab651ee2 100644
--- a/drivers/ras/amd/atl/umc.c
+++ b/drivers/ras/amd/atl/umc.c
@@ -315,7 +315,7 @@ static u8 get_die_id(struct atl_err *err)
* For CPUs, this is the AMD Node ID modulo the number
* of AMD Nodes per socket.
*/
- return topology_die_id(err->cpu) % amd_get_nodes_per_socket();
+ return topology_die_id(err->cpu) % topology_amd_nodes_per_pkg();
}
#define UMC_CHANNEL_NUM GENMASK(31, 20)
--
2.43.0
--
Cheers,
Stephen Rothwell
Attachment:
pgpMrRcD8WI6N.pgp
Description: OpenPGP digital signature
