From owner-p4-projects@FreeBSD.ORG Thu Dec 30 19:40:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10CB316A4D1; Thu, 30 Dec 2004 19:40:13 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C22D716A4CF for ; Thu, 30 Dec 2004 19:40:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86B6643D39 for ; Thu, 30 Dec 2004 19:40:12 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBUJeC1n035777 for ; Thu, 30 Dec 2004 19:40:12 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBUJeCE1035774 for perforce@freebsd.org; Thu, 30 Dec 2004 19:40:12 GMT (envelope-from jhb@freebsd.org) Date: Thu, 30 Dec 2004 19:40:12 GMT Message-Id: <200412301940.iBUJeCE1035774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 67919 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Dec 2004 19:40:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=67919 Change 67919 by jhb@jhb_slimer on 2004/12/30 19:39:48 IFC @67918. Affected files ... .. //depot/projects/smpng/sys/i386/i386/exception.s#21 integrate .. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#37 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#58 integrate .. //depot/projects/smpng/sys/kern/tty.c#56 integrate Differences ... ==== //depot/projects/smpng/sys/i386/i386/exception.s#21 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/exception.s,v 1.111 2004/05/26 07:43:41 bde Exp $ + * $FreeBSD: src/sys/i386/i386/exception.s,v 1.112 2004/12/30 19:14:48 jhb Exp $ */ #include "opt_apic.h" ==== //depot/projects/smpng/sys/i386/i386/sys_machdep.c#37 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.93 2004/11/27 06:51:36 das Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.94 2004/12/30 19:26:23 jhb Exp $"); #include "opt_kstack_pages.h" #include "opt_mac.h" @@ -432,7 +432,7 @@ /* * Treat this as a special case, so userland needn't * know magic number NLDT. - */ + */ uap->start = NLDT; uap->num = MAX_LD - NLDT; } @@ -552,7 +552,7 @@ /* Allocate a free slot */ pldt = mdp->md_ldt; if (pldt == NULL) { - error = i386_ldt_grow(td, NLDT+1); + error = i386_ldt_grow(td, NLDT + 1); if (error) { kmem_free(kernel_map, (vm_offset_t)descs, descs_size); ==== //depot/projects/smpng/sys/i386/i386/vm_machdep.c#58 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.248 2004/12/27 06:15:03 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.249 2004/12/30 19:26:23 jhb Exp $"); #include "opt_isa.h" #include "opt_npx.h" @@ -246,9 +246,9 @@ */ pcb2->pcb_ext = 0; - /* Copy the LDT, if necessary. */ + /* Copy the LDT, if necessary. */ mtx_lock_spin(&sched_lock); - if (mdp2->md_ldt != NULL) { + if (mdp2->md_ldt != NULL) { if (flags & RFMEM) { mdp2->md_ldt->ldt_refcnt++; } else { @@ -257,7 +257,7 @@ if (mdp2->md_ldt == NULL) panic("could not copy LDT"); } - } + } mtx_unlock_spin(&sched_lock); /* @@ -323,11 +323,11 @@ if (td == PCPU_GET(fpcurthread)) npxdrop(); #endif - if (pcb->pcb_flags & PCB_DBREGS) { + if (pcb->pcb_flags & PCB_DBREGS) { /* disable all hardware breakpoints */ - reset_dbregs(); - pcb->pcb_flags &= ~PCB_DBREGS; - } + reset_dbregs(); + pcb->pcb_flags &= ~PCB_DBREGS; + } } void ==== //depot/projects/smpng/sys/kern/tty.c#56 (text+ko) ==== @@ -71,7 +71,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.243 2004/12/20 21:38:13 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.244 2004/12/30 19:24:49 jhb Exp $"); #include "opt_compat.h" #include "opt_tty.h"