From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 31 Oct 2023 01:40:57 +0000 (-1000)
Subject: Merge tag 'x86-mm-2023-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
X-Git-Tag: v6.7-rc1~184
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f0d25b5d0f8ef0ad35f1beff17da5843279d47a1;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'x86-mm-2023-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 mm handling updates from Ingo Molnar:

 - Add new NX-stack self-test

 - Improve NUMA partial-CFMWS handling

 - Fix #VC handler bugs resulting in SEV-SNP boot failures

 - Drop the 4MB memory size restriction on minimal NUMA nodes

 - Reorganize headers a bit, in preparation to header dependency
   reduction efforts

 - Misc cleanups & fixes

* tag 'x86-mm-2023-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Drop the 4 MB restriction on minimal NUMA node memory size
  selftests/x86/lam: Zero out buffer for readlink()
  x86/sev: Drop unneeded #include
  x86/sev: Move sev_setup_arch() to mem_encrypt.c
  x86/tdx: Replace deprecated strncpy() with strtomem_pad()
  selftests/x86/mm: Add new test that userspace stack is in fact NX
  x86/sev: Make boot_ghcb_page[] static
  x86/boot: Move x86_cache_alignment initialization to correct spot
  x86/sev-es: Set x86_virt_bits to the correct value straight away, instead of a two-phase approach
  x86/sev-es: Allow copy_from_kernel_nofault() in earlier boot
  x86_64: Show CR4.PSE on auxiliaries like on BSP
  x86/iommu/docs: Update AMD IOMMU specification document URL
  x86/sev/docs: Update document URL in amd-memory-encryption.rst
  x86/mm: Move arch_memory_failure() and arch_is_platform_page() definitions from <asm/processor.h> to <asm/pgtable.h>
  ACPI/NUMA: Apply SRAT proximity domain to entire CFMWS window
  x86/numa: Introduce numa_fill_memblks()
---

f0d25b5d0f8ef0ad35f1beff17da5843279d47a1
diff --cc include/linux/numa.h
index fb30a42f0700d,0f512c0aba54b..a904861de8000
--- a/include/linux/numa.h
+++ b/include/linux/numa.h
@@@ -43,8 -44,14 +44,14 @@@ static inline int phys_to_target_node(u
  	return 0;
  }
  #endif
+ #ifndef numa_fill_memblks
+ static inline int __init numa_fill_memblks(u64 start, u64 end)
+ {
+ 	return NUMA_NO_MEMBLK;
+ }
+ #endif
  #else /* !CONFIG_NUMA */
 -static inline int numa_map_to_online_node(int node)
 +static inline int numa_nearest_node(int node, unsigned int state)
  {
  	return NUMA_NO_NODE;
  }