diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-13 11:37:01 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-13 11:37:01 +0300 |
| commit | 2fb8414e644b133a9c3250f408232af99da256a4 (patch) | |
| tree | 62212fe1b6dec3949a47ac6d92f3070842ab9ae2 /arch/x86/mm | |
| parent | 821f82125c47217390099532b09bd09cee9adaac (diff) | |
| parent | c1ab4ce3cb759f69fb9085a060e568b73e8f5cd8 (diff) | |
| download | linux-2fb8414e644b133a9c3250f408232af99da256a4.tar.xz | |
Merge branch 'x86/cpu' into x86/core, to resolve conflicts
Conflicts:
arch/x86/kernel/cpu/bugs.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/amdtopology.c | 2 | ||||
| -rw-r--r-- | arch/x86/mm/numa.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/amdtopology.c b/arch/x86/mm/amdtopology.c index 628833afee37..f980b0eb0105 100644 --- a/arch/x86/mm/amdtopology.c +++ b/arch/x86/mm/amdtopology.c @@ -25,7 +25,7 @@ #include <asm/numa.h> #include <asm/mpspec.h> #include <asm/apic.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> static unsigned char __initdata nodeids[8]; diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 64e5cdb2460a..fed02d1073c7 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -18,7 +18,7 @@ #include <asm/e820/api.h> #include <asm/proto.h> #include <asm/dma.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include "numa_internal.h" |