diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:35:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:35:27 +0200 |
| commit | 821f82125c47217390099532b09bd09cee9adaac (patch) | |
| tree | 26b526b4ffa17e5bd302381bff5d4bbadfe1299d /arch/x86/coco/core.c | |
| parent | 206c07d6ab88e0bb02e7c0dc134b38f7973e968b (diff) | |
| parent | ed4d95d033e359f9445e85bf5a768a5859a5830b (diff) | |
Merge branch 'x86/boot' into x86/core, to merge dependent commits
Prepare to resolve conflicts with an upstream series of fixes that conflict
with pending x86 changes:
6f5bf947bab0 Merge tag 'its-for-linus-20250509' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/coco/core.c')
| -rw-r--r-- | arch/x86/coco/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/coco/core.c b/arch/x86/coco/core.c index 9a0ddda3aa69..d4610af68114 100644 --- a/arch/x86/coco/core.c +++ b/arch/x86/coco/core.c @@ -18,7 +18,9 @@ #include <asm/processor.h> enum cc_vendor cc_vendor __ro_after_init = CC_VENDOR_NONE; +SYM_PIC_ALIAS(cc_vendor); u64 cc_mask __ro_after_init; +SYM_PIC_ALIAS(cc_mask); static struct cc_attr_flags { __u64 host_sev_snp : 1, |