D9701.id.diff
No OneTemporary
Actions

Size

927 B

Referenced Files

None

Subscribers

None

D9701.id.diff
View Options

	Index: sys/arm/arm/trap-v6.c
	===================================================================
	--- sys/arm/arm/trap-v6.c
	+++ sys/arm/arm/trap-v6.c
	@@ -542,7 +542,7 @@
	usermode = TRAPF_USERMODE(tf);
	#ifdef KDTRACE_HOOKS
	if (!usermode) {
	- if (dtrace_trap_func != NULL && (*dtrace_trap_func)(tf, far))
	+ if (dtrace_trap_func != NULL && (*dtrace_trap_func)(tf, fsr))
	return (0);
	}
	#endif
	Index: sys/cddl/dev/dtrace/arm/dtrace_subr.c
	===================================================================
	--- sys/cddl/dev/dtrace/arm/dtrace_subr.c
	+++ sys/cddl/dev/dtrace/arm/dtrace_subr.c
	@@ -201,6 +201,10 @@
	switch (type) {
	/* Page fault. */
	case FAULT_ALIGN:
	+ /* Translation Fault (L1) */
	+ case FAULT_TRAN_L1:
	+ /* Translation Fault (L2) */
	+ case FAULT_TRAN_L2:
	/* Flag a bad address. */
	cpu_core[curcpu].cpuc_dtrace_flags \|= CPU_DTRACE_BADADDR;
	cpu_core[curcpu].cpuc_dtrace_illval = 0;