Skip to content

Commit 43b0a71

Browse files
committed
fixes fro Tianyu's patches
1 parent a6428db commit 43b0a71

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

arch/x86/hyperv/hv_init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ void __init hyperv_init(void)
382382
PAGE_SIZE,
383383
GFP_KERNEL);
384384
if (hv_vp_early_input_arg) {
385-
ret = set_memory_decrypted(hv_vp_early_input_arg,
385+
ret = set_memory_decrypted((u64)hv_vp_early_input_arg,
386386
num_possible_cpus());
387387
if (ret) {
388388
kfree(hv_vp_early_input_arg);
@@ -568,7 +568,7 @@ void __init hyperv_init(void)
568568
kfree(hv_vp_assist_page);
569569
hv_vp_assist_page = NULL;
570570
free_vp_early_input_arg:
571-
set_memory_encrypted(hv_vp_early_input_arg, num_possible_cpus());
571+
set_memory_encrypted((u64)hv_vp_early_input_arg, num_possible_cpus());
572572
kfree(hv_vp_early_input_arg);
573573
hv_vp_early_input_arg = NULL;
574574
common_free:

arch/x86/hyperv/ivm.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,6 @@ union hv_ghcb {
6565
/* Only used in an SNP VM with the paravisor */
6666
static u16 hv_ghcb_version __ro_after_init;
6767

68-
/*
69-
* Use static page to set Secure AVIC backing page.
70-
* The operation happens before allocating input arg
71-
* page when start AP.
72-
*/
73-
static u8 inputbuf[PAGE_SIZE] __bss_decrypted __aligned(PAGE_SIZE);
74-
7568
/* Functions only used in an SNP VM with the paravisor go here. */
7669
u64 hv_ghcb_hypercall(u64 control, void *input, void *output, u32 input_size)
7770
{

0 commit comments

Comments
 (0)