[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen master] xenoprof: move asm/ include



commit ad193a79c25ae24f1de5f37900e1da74ab48e8bd
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Fri Nov 3 11:25:03 2023 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Nov 3 11:25:03 2023 +0100

    xenoprof: move asm/ include
    
    There's no need for xen/xenoprof.h to include the arch header when the
    respective config option is off. The only compensation needed is for
    svm.c to explicitly include the arch header instead of the common one
    (matching what vmx.c and traps.c do).
    
    With that Arm's header can be deleted, and neither RISC-V nor PPC will
    need to introduce one.
    
    While there also adjust and move the (prior) inclusion of inttypes.h.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
    Reviewed-by: Bertrand Marquis <bertrand.marquis@xxxxxxx> # arm
---
 xen/arch/arm/include/asm/xenoprof.h | 12 ------------
 xen/arch/ppc/include/asm/xenoprof.h |  0
 xen/arch/x86/hvm/svm/svm.c          |  2 +-
 xen/include/xen/xenoprof.h          |  6 +++---
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/xen/arch/arm/include/asm/xenoprof.h 
b/xen/arch/arm/include/asm/xenoprof.h
deleted file mode 100644
index 3db6ce3ab2..0000000000
--- a/xen/arch/arm/include/asm/xenoprof.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __ASM_XENOPROF_H__
-#define __ASM_XENOPROF_H__
-
-#endif /* __ASM_XENOPROF_H__ */
-/*
- * Local variables:
- * mode: C
- * c-file-style: "BSD"
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * End:
- */
diff --git a/xen/arch/ppc/include/asm/xenoprof.h 
b/xen/arch/ppc/include/asm/xenoprof.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index 24c417ca71..674e54e04a 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -12,7 +12,6 @@
 #include <xen/lib.h>
 #include <xen/sched.h>
 #include <xen/trace.h>
-#include <xen/xenoprof.h>
 
 #include <asm/amd.h>
 #include <asm/apic.h>
@@ -38,6 +37,7 @@
 #include <asm/processor.h>
 #include <asm/p2m.h>
 #include <asm/x86_emulate.h>
+#include <asm/xenoprof.h>
 
 #include <public/sched.h>
 
diff --git a/xen/include/xen/xenoprof.h b/xen/include/xen/xenoprof.h
index 101514c148..c3dac447d3 100644
--- a/xen/include/xen/xenoprof.h
+++ b/xen/include/xen/xenoprof.h
@@ -10,15 +10,15 @@
 #ifndef __XEN_XENOPROF_H__
 #define __XEN_XENOPROF_H__
 
-#include <xen/inttypes.h>
-#include <asm/xenoprof.h>
-
 #define PMU_OWNER_NONE          0
 #define PMU_OWNER_XENOPROF      1
 #define PMU_OWNER_HVM           2
 
 #ifdef CONFIG_XENOPROF
 
+#include <xen/stdint.h>
+#include <asm/xenoprof.h>
+
 struct domain;
 struct vcpu;
 struct cpu_user_regs;
--
generated by git-patchbot for /home/xen/git/xen.git#master



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.