[src/sommerfeld_i386mp_1]: src/sys/arch/i386/i386 Adapt to intr.h/IPL_* changes.

[sommerfeld <sommerfeld%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1c48dd7374e6
branches:  sommerfeld_i386mp_1
changeset: 482170:1c48dd7374e6
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Sun Feb 20 18:03:11 2000 +0000

description:
Adapt to intr.h/IPL_* changes.

diffstat:

 sys/arch/i386/i386/trap.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r b0aa9e261ddc -r 1c48dd7374e6 sys/arch/i386/i386/trap.c
--- a/sys/arch/i386/i386/trap.c Sun Feb 20 18:01:05 2000 +0000
+++ b/sys/arch/i386/i386/trap.c Sun Feb 20 18:03:11 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.134 1999/12/04 21:20:32 ragge Exp $ */
+/*     $NetBSD: trap.c,v 1.134.2.1 2000/02/20 18:03:11 sommerfeld Exp $        */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -263,7 +263,7 @@
        if (trapdebug) {
                printf("trap %d code %x eip %x cs %x eflags %x cr2 %x cpl %x\n",
                    frame.tf_trapno, frame.tf_err, frame.tf_eip, frame.tf_cs,
-                   frame.tf_eflags, rcr2(), cpl);
+                   frame.tf_eflags, rcr2(), lapic_tpr);
                printf("curproc %p\n", curproc);
        }
 #endif
@@ -304,7 +304,7 @@
                        printf("unknown trap %d", frame.tf_trapno);
                printf(" in %s mode\n", (type & T_USER) ? "user" : "supervisor");
                printf("trap type %d code %x eip %x cs %x eflags %x cr2 %x cpl %x\n",
-                   type, frame.tf_err, frame.tf_eip, frame.tf_cs, frame.tf_eflags, rcr2(), cpl);
+                   type, frame.tf_err, frame.tf_eip, frame.tf_cs, frame.tf_eflags, rcr2(), lapic_tpr);
 
                panic("trap");
                /*NOTREACHED*/