tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: KVM: arm64: Disallow #include trace.h for pKVM.

Browse Source 
pKVM modules must use #include "nvhe/trace.h" instead of a simple
"trace.h". This is clearer.

Fix pkvm-smc to use nvhe/trace.h.

Bug: 416603216
Bug: 357781595
Change-Id: Iccb1c182dc98dc27f8b462bad572e2544f44dce1
Signed-off-by: HONG Yifan <elsk@google.com>
This commit is contained in:
HONG Yifan
2025-05-22 19:20:48 +00:00
committed by Treehugger Robot
parent f503b8a51a
commit 56ad021f7a
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm64/kvm/hyp/nvhe/Makefile.module
-3
View File
@@ -5,9 +5,6 @@ $(obj)/hyp.lds: arch/arm64/kvm/hyp/nvhe/module.lds.S FORCE
include $(srctree)/arch/arm64/kvm/hyp/nvhe/Makefile.nvhe include $(srctree)/arch/arm64/kvm/hyp/nvhe/Makefile.nvhe
# Deprecated; subject to removal.
ccflags-y += -I$(srctree)/arch/arm64/kvm/hyp/include/module/nvhe
# LINT.IfChange(includes) # LINT.IfChange(includes)
ccflags-y += -I$(srctree)/arch/arm64/kvm/hyp/include/module ccflags-y += -I$(srctree)/arch/arm64/kvm/hyp/include/module
# LINT.ThenChange(/BUILD.bazel:pkvm_includes) # LINT.ThenChange(/BUILD.bazel:pkvm_includes)
drivers/misc/pkvm-smc/pkvm/events.h
+1 -1
View File
@@ -3,7 +3,7 @@
#define __PKVM_SMC_FILTER_HYPEVENTS_H_ #define __PKVM_SMC_FILTER_HYPEVENTS_H_
#ifdef __KVM_NVHE_HYPERVISOR__ #ifdef __KVM_NVHE_HYPERVISOR__
#include <trace.h> #include <nvhe/trace.h>
#endif #endif
HYP_EVENT(filtered_smc, HYP_EVENT(filtered_smc,
drivers/misc/pkvm-smc/pkvm/pkvm-smc.c
+1 -1
View File
@@ -11,7 +11,7 @@
#include "events.h" #include "events.h"
#define HYP_EVENT_FILE ../../../../drivers/misc/pkvm-smc/pkvm/events.h #define HYP_EVENT_FILE ../../../../drivers/misc/pkvm-smc/pkvm/events.h
#include <define_events.h> #include <nvhe/define_events.h>
const struct pkvm_module_ops *pkvm_ops; const struct pkvm_module_ops *pkvm_ops;
bool permissive; bool permissive;