Date: Thu, 23 Jun 2005 23:16:43 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 78881 for review Message-ID: <200506232316.j5NNGh3g081168@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200506232316.j5NNGh3g081168>