Commit b9021de3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b019b4a6 fce9642c

arch/x86/include/asm/amd_nb.h

+4 −1
Original line number Diff line number Diff line
@@ -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