Date: Sat, 20 Nov 2004 20:05:58 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 65572 for review Message-ID: <200411202005.iAKK5wm0062672@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=65572 Change 65572 by peter@peter_daintree on 2004/11/20 20:05:21 Integ -I -b i386_hammer (converge) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#24 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#37 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#35 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#107 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#77 integrate .. //depot/projects/hammer/sys/amd64/amd64/support.S#26 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#55 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#50 integrate .. //depot/projects/hammer/sys/amd64/include/atomic.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/cpu.h#17 integrate .. //depot/projects/hammer/sys/amd64/include/endian.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#28 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#24 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#37 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#35 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#107 (text+ko) ==== @@ -588,8 +588,7 @@ * CR0_MP, CR0_NE and CR0_TS are also set by npx_probe() for the * BSP. See the comments there about why we set them. */ - cr0 |= CR0_MP | CR0_NE | CR0_TS; - cr0 |= CR0_WP | CR0_AM; + cr0 |= CR0_MP | CR0_NE | CR0_TS | CR0_WP | CR0_AM; load_cr0(cr0); } ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#77 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/support.S#26 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#55 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#50 (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.1174) +# (XXX from i386:NOTES,v 1.1176) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.20 2004/09/22 01:04:54 peter Exp $ # ==== //depot/projects/hammer/sys/amd64/include/atomic.h#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/cpu.h#17 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/endian.h#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/param.h#28 (text+ko) ==== @@ -126,7 +126,6 @@ #endif #define KSTACK_GUARD_PAGES 1 /* pages of kstack guard; 0 disables */ - /* * Ceiling on amount of swblock kva space, can be changed via * the kern.maxswzone /boot/loader.conf variable.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411202005.iAKK5wm0062672>