From owner-p4-projects@FreeBSD.ORG Thu Jun 23 23:16:44 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 390D016A420; Thu, 23 Jun 2005 23:16:44 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 11D2F16A41C for ; Thu, 23 Jun 2005 23:16:44 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D99D943D1F for ; Thu, 23 Jun 2005 23:16:43 +0000 (GMT) (envelope-from peter@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 j5NNGhan081171 for ; Thu, 23 Jun 2005 23:16:43 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5NNGh3g081168 for perforce@freebsd.org; Thu, 23 Jun 2005 23:16:43 GMT (envelope-from peter@freebsd.org) Date: Thu, 23 Jun 2005 23:16:43 GMT Message-Id: <200506232316.j5NNGh3g081168@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78881 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jun 2005 23:16:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=78881 Change 78881 by peter@peter_daintree on 2005/06/23 23:15:52 Merge i386_hammer changes Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#42 integrate .. //depot/projects/hammer/sys/amd64/amd64/initcpu.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#53 integrate .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#23 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#64 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#73 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#70 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#32 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#42 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/initcpu.c#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#53 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#23 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#64 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#73 (text+ko) ==== @@ -206,14 +206,14 @@ void cpu_thread_exit(struct thread *td) { - struct pcb *pcb = td->td_pcb; if (td == PCPU_GET(fpcurthread)) fpudrop(); - if (pcb->pcb_flags & PCB_DBREGS) { - /* disable all hardware breakpoints */ + + /* Disable any hardware breakpoints. */ + if (td->td_pcb->pcb_flags & PCB_DBREGS) { reset_dbregs(); - pcb->pcb_flags &= ~PCB_DBREGS; + td->td_pcb->pcb_flags &= ~PCB_DBREGS; } } ==== //depot/projects/hammer/sys/amd64/conf/NOTES#70 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1200) +# (XXX from i386:NOTES,v 1.1201) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.35 2005/06/14 14:21:25 ups Exp $ # @@ -108,12 +108,6 @@ ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS -# -# Add support for the ReiserFS filesystem (used in Linux). Currently, -# this is limited to read-only access. -# -options REISERFS - device gzip #Exec gzipped a.out's. REQUIRES COMPAT_AOUT! ==== //depot/projects/hammer/sys/amd64/include/md_var.h#32 (text+ko) ====