From 8f82b3111ed84cef05772596e15511672f90e5a3 Mon Sep 17 00:00:00 2001 From: marcel Date: Fri, 6 Jun 2003 23:44:05 +0000 Subject: Use TRAPF_USERMODE() to replace an equivalent check in trap(). While here, amend the related comment. --- sys/ia64/ia64/trap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c index 2fedb8f..8626641 100644 --- a/sys/ia64/ia64/trap.c +++ b/sys/ia64/ia64/trap.c @@ -699,10 +699,9 @@ trap(int vector, struct trapframe *framep) /* * Additionally check the privilege level. We don't want to * panic when we're in the gateway page, running at user - * level. + * level. This happens for the signal trampolines. */ - if (!user && (framep->tf_special.psr & IA64_PSR_CPL) - == IA64_PSR_CPL_KERN) { + if (!TRAPF_USERMODE(framep)) { /* Check for copyin/copyout fault. */ if (td != NULL && td->td_pcb->pcb_onfault != 0) { framep->tf_special.iip = -- cgit v1.1