D29356.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D29356.diff
View Options

	diff --git a/sys/cddl/dev/fbt/aarch64/fbt_isa.c b/sys/cddl/dev/fbt/aarch64/fbt_isa.c
	--- a/sys/cddl/dev/fbt/aarch64/fbt_isa.c
	+++ b/sys/cddl/dev/fbt/aarch64/fbt_isa.c
	@@ -44,6 +44,7 @@
	#define FBT_PATCHVAL (AARCH64_BRK \| AARCH64_BRK_IMM16_VAL)
	#define FBT_ENTRY "entry"
	#define FBT_RETURN "return"
	+#define FBT_AFRAMES 4

	int
	fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t rval)
	@@ -141,7 +142,7 @@
	fbt = malloc(sizeof (fbt_probe_t), M_FBT, M_WAITOK \| M_ZERO);
	fbt->fbtp_name = name;
	fbt->fbtp_id = dtrace_probe_create(fbt_id, modname,
	- name, FBT_ENTRY, 3, fbt);
	+ name, FBT_ENTRY, FBT_AFRAMES, fbt);
	fbt->fbtp_patchpoint = instr;
	fbt->fbtp_ctl = lf;
	fbt->fbtp_loadcnt = lf->loadcnt;
	@@ -183,7 +184,7 @@
	fbt->fbtp_name = name;
	if (retfbt == NULL) {
	fbt->fbtp_id = dtrace_probe_create(fbt_id, modname,
	- name, FBT_RETURN, 3, fbt);
	+ name, FBT_RETURN, FBT_AFRAMES, fbt);
	} else {
	retfbt->fbtp_probenext = fbt;
	fbt->fbtp_id = retfbt->fbtp_id;
	diff --git a/sys/cddl/dev/profile/profile.c b/sys/cddl/dev/profile/profile.c
	--- a/sys/cddl/dev/profile/profile.c
	+++ b/sys/cddl/dev/profile/profile.c
	@@ -140,8 +140,7 @@
	#endif

	#ifdef __aarch64__
	-/* TODO: verify */
	-#define PROF_ARTIFICIAL_FRAMES 10
	+#define PROF_ARTIFICIAL_FRAMES 12
	#endif

	#ifdef __riscv