[GIT pull] x86/urgent for v6.12-rc6

Thomas Gleixner posted 1 patch 3 weeks ago
arch/x86/include/asm/amd_nb.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
[GIT pull] x86/urgent for v6.12-rc6
Posted by Thomas Gleixner 3 weeks ago
Linus,

please pull the latest x86/urgent branch from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-2024-11-03

up to:  fce9642c765a: x86/amd_nb: Fix compile-testing without CONFIG_AMD_NB


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.

Thanks,

	tglx

------------------>
Arnd Bergmann (1):
      x86/amd_nb: Fix compile-testing without CONFIG_AMD_NB


 arch/x86/include/asm/amd_nb.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h
index 6f3b6aef47ba..d0caac26533f 100644
--- a/arch/x86/include/asm/amd_nb.h
+++ b/arch/x86/include/asm/amd_nb.h
@@ -116,7 +116,10 @@ static inline bool amd_gart_present(void)
 
 #define amd_nb_num(x)		0
 #define amd_nb_has_feature(x)	false
-#define node_to_amd_nb(x)	NULL
+static inline struct amd_northbridge *node_to_amd_nb(int node)
+{
+	return NULL;
+}
 #define amd_gart_present(x)	false
 
 #endif
Re: [GIT pull] x86/urgent for v6.12-rc6
Posted by pr-tracker-bot@kernel.org 2 weeks, 6 days ago
The pull request you sent on Sun,  3 Nov 2024 11:31:05 +0100 (CET):

> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-2024-11-03

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b9021de3ec2f39074aae92ed69c3823e30cd8cdb

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html