Skip to content

Commit c1e8980

Browse files
committed
x86/sev: Move the internal header
Move the internal header out of the usual include/asm/ include path because having an "internal" header there doesn't really make it internal - quite the opposite - that's the normal arch include path. So move where it belongs and make it really internal. No functional changes. Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/20251204145716.GDaTGhTEHNOtSdTkEe@fat_crate.local
1 parent f8f9c1f commit c1e8980

5 files changed

Lines changed: 8 additions & 4 deletions

File tree

arch/x86/boot/startup/sev-startup.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <asm/cpu_entry_area.h>
2828
#include <asm/stacktrace.h>
2929
#include <asm/sev.h>
30-
#include <asm/sev-internal.h>
3130
#include <asm/insn-eval.h>
3231
#include <asm/fpu/xcr.h>
3332
#include <asm/processor.h>
@@ -41,6 +40,8 @@
4140
#include <asm/cpuid/api.h>
4241
#include <asm/cmdline.h>
4342

43+
#include "../../coco/sev/internal.h"
44+
4445
/* Include code shared with pre-decompression boot stage */
4546
#include "sev-shared.c"
4647

arch/x86/coco/sev/core.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include <asm/cpu_entry_area.h>
3232
#include <asm/stacktrace.h>
3333
#include <asm/sev.h>
34-
#include <asm/sev-internal.h>
3534
#include <asm/insn-eval.h>
3635
#include <asm/fpu/xcr.h>
3736
#include <asm/processor.h>
@@ -46,6 +45,8 @@
4645
#include <asm/cmdline.h>
4746
#include <asm/msr.h>
4847

48+
#include "internal.h"
49+
4950
/* Bitmap of SEV features supported by the hypervisor */
5051
u64 sev_hv_features __ro_after_init;
5152
SYM_PIC_ALIAS(sev_hv_features);

arch/x86/coco/sev/noinstr.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
#include <asm/msr.h>
1717
#include <asm/ptrace.h>
1818
#include <asm/sev.h>
19-
#include <asm/sev-internal.h>
19+
20+
#include "internal.h"
2021

2122
static __always_inline bool on_vc_stack(struct pt_regs *regs)
2223
{

arch/x86/coco/sev/vc-handle.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <asm/init.h>
2424
#include <asm/stacktrace.h>
2525
#include <asm/sev.h>
26-
#include <asm/sev-internal.h>
2726
#include <asm/insn-eval.h>
2827
#include <asm/fpu/xcr.h>
2928
#include <asm/processor.h>
@@ -35,6 +34,8 @@
3534
#include <asm/apic.h>
3635
#include <asm/cpuid/api.h>
3736

37+
#include "internal.h"
38+
3839
static enum es_result vc_slow_virt_to_phys(struct ghcb *ghcb, struct es_em_ctxt *ctxt,
3940
unsigned long vaddr, phys_addr_t *paddr)
4041
{

0 commit comments

Comments
 (0)