Page MenuHomeFreeBSD
Files F108646637

D27719.diff
No OneTemporary
Actions

D27719.diff
View Options

Index: sys/arm64/arm64/trap.c
===================================================================
--- sys/arm64/arm64/trap.c
+++ sys/arm64/arm64/trap.c
@@ -360,7 +360,6 @@
void
do_el1h_sync(struct thread *td, struct trapframe *frame)
{
- struct trapframe *oframe;
uint32_t exception;
uint64_t esr, far;
int dfsc;
@@ -378,18 +377,6 @@
"do_el1_sync: curthread: %p, esr %lx, elr: %lx, frame: %p", td,
esr, frame->tf_elr, frame);
- oframe = td->td_frame;
-
- switch (exception) {
- case EXCP_BRK:
- case EXCP_WATCHPT_EL1:
- case EXCP_SOFTSTP_EL1:
- break;
- default:
- td->td_frame = frame;
- break;
- }
-
switch (exception) {
case EXCP_FP_SIMD:
case EXCP_TRAP_FP:
@@ -429,18 +416,15 @@
}
#endif
#ifdef KDB
- kdb_trap(exception, 0,
- (td->td_frame != NULL) ? td->td_frame : frame);
+ kdb_trap(exception, 0, frame);
#else
panic("No debugger in kernel.\n");
#endif
- frame->tf_elr += 4;
break;
case EXCP_WATCHPT_EL1:
case EXCP_SOFTSTP_EL1:
#ifdef KDB
- kdb_trap(exception, 0,
- (td->td_frame != NULL) ? td->td_frame : frame);
+ kdb_trap(exception, 0, frame);
#else
panic("No debugger in kernel.\n");
#endif
@@ -455,8 +439,6 @@
panic("Unknown kernel exception %x esr_el1 %lx\n", exception,
esr);
}
-
- td->td_frame = oframe;
}
void

File Metadata

Mime Type
text/plain
Expires
Tue, Jan 28, 1:45 AM (9 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16235700
Default Alt Text
D27719.diff (1 KB)

Event Timeline