Skip to content

Commit b9021de

Browse files
committed
Merge tag 'x86-urgent-2024-11-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Thomas Gleixner: "A trivial compile test fix for x86: When CONFIG_AMD_NB is not set a COMPILE_TEST of an AMD specific driver fails due to a missing inline stub. Add the stub to cure it" * tag 'x86-urgent-2024-11-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/amd_nb: Fix compile-testing without CONFIG_AMD_NB
2 parents b019b4a + fce9642 commit b9021de

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

arch/x86/include/asm/amd_nb.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,10 @@ static inline bool amd_gart_present(void)
116116

117117
#define amd_nb_num(x) 0
118118
#define amd_nb_has_feature(x) false
119-
#define node_to_amd_nb(x) NULL
119+
static inline struct amd_northbridge *node_to_amd_nb(int node)
120+
{
121+
return NULL;
122+
}
120123
#define amd_gart_present(x) false
121124

122125
#endif

0 commit comments

Comments
 (0)