File xen.trc-packed.patch of Package xen
From: Olaf Hering <olaf@aepfle.de>
Date: Fri, 16 Jun 2023 10:34:56 +0000
Subject: trc packed
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
xen/common/trace.c | 9 ---------
xen/include/Makefile | 2 +-
2 files changed, 1 insertion(+), 10 deletions(-)
--- a/xen/common/trace.c
+++ b/xen/common/trace.c
@@ -25,33 +25,24 @@
#include <xen/errno.h>
#include <xen/event.h>
#include <xen/tasklet.h>
#include <xen/init.h>
#include <xen/mm.h>
#include <xen/percpu.h>
#include <xen/pfn.h>
#include <xen/sections.h>
#include <xen/cpu.h>
#include <asm/atomic.h>
#include <public/sysctl.h>
-#ifdef CONFIG_COMPAT
-#include <compat/trace.h>
-#define xen_t_buf t_buf
-CHECK_t_buf;
-#undef xen_t_buf
-#else
-#define compat_t_rec t_rec
-#endif
-
/* opt_tbuf_size: trace buffer size (in pages) for each cpu */
static unsigned int opt_tbuf_size;
static unsigned int opt_tevt_mask;
integer_param("tbuf_size", opt_tbuf_size);
integer_param("tevt_mask", opt_tevt_mask);
/* Pointers to the meta-data objects for all system trace buffers */
static struct t_info *t_info;
static unsigned int t_info_pages;
static DEFINE_PER_CPU_READ_MOSTLY(uint16_t, t_info_mfn_offset);
static DEFINE_PER_CPU_READ_MOSTLY(struct t_buf *, t_bufs);
--- a/xen/include/Makefile
+++ b/xen/include/Makefile
@@ -21,25 +21,25 @@ headers-$(CONFIG_X86) += compat/arch-x86/pmu.h
headers-$(CONFIG_X86) += compat/arch-x86/xen-mca.h
headers-$(CONFIG_X86) += compat/arch-x86/xen.h
headers-$(CONFIG_X86) += compat/arch-x86/xen-$(compat-arch-y).h
headers-$(CONFIG_ARGO) += compat/argo.h
headers-$(CONFIG_PV) += compat/callback.h
headers-$(CONFIG_GRANT_TABLE) += compat/grant_table.h
headers-$(CONFIG_PV_SHIM) += compat/grant_table.h
headers-$(CONFIG_HVM) += compat/hvm/dm_op.h
headers-$(CONFIG_HVM) += compat/hvm/hvm_op.h
headers-$(CONFIG_HVM) += compat/hvm/hvm_vcpu.h
headers-$(CONFIG_HYPFS) += compat/hypfs.h
headers-$(CONFIG_KEXEC) += compat/kexec.h
-headers-$(CONFIG_TRACEBUFFER) += compat/trace.h
+headers-n += compat/trace.h
headers-$(CONFIG_XENOPROF) += compat/xenoprof.h
headers-$(CONFIG_XSM_FLASK) += compat/xsm/flask_op.h
headers-n := $(sort $(filter-out $(headers-y),$(headers-n) $(headers-)))
cppflags-y := -include public/xen-compat.h -DXEN_GENERATING_COMPAT_HEADERS
cppflags-$(CONFIG_X86) += -m32
endif
public-$(CONFIG_X86) := $(sort $(wildcard $(srcdir)/public/arch-x86/*.h $(srcdir)/public/arch-x86/*/*.h))
public-$(CONFIG_ARM) := $(sort $(wildcard $(srcdir)/public/arch-arm/*.h $(srcdir)/public/arch-arm/*/*.h))