Date: Mon, 1 Dec 2003 13:19:29 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 43250 for review Message-ID: <200312012119.hB1LJT9f068209@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=43250 Change 43250 by peter@peter_daintree on 2003/12/01 13:18:40 cosmetic sync with i386 Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#5 edit .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#73 edit .. //depot/projects/hammer/sys/amd64/amd64/mem.c#13 edit .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#19 edit .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#47 edit .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#22 edit .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#11 edit .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#8 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)npx.c 7.2 (Berkeley) 5/12/91 + * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 */ #include <sys/cdefs.h> ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#73 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)machdep.c 7.4 (Berkeley) 6/3/91 + * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 */ #include <sys/cdefs.h> ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#13 (text+ko) ==== @@ -36,8 +36,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Utah $Hdr: mem.c 1.13 89/10/08$ - * @(#)mem.c 7.2 (Berkeley) 5/9/91 + * from: Utah $Hdr: mem.c 1.13 89/10/08$ + * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 */ #include <sys/cdefs.h> @@ -175,6 +175,7 @@ } c = iov->iov_len; + /* * Make sure that all of the pages are currently resident so * that we don't create any zero-fill pages. ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#19 (text+ko) ==== @@ -174,7 +174,7 @@ if (last == -1) last = irq; } else if (last != -1) { - if (rman_manage_region(&irq_rman, last, irq - 1) != 0) + if (rman_manage_region(&irq_rman, last, irq - 1) != 0) panic("nexus_probe irq_rman add"); last = -1; } ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#47 (text+ko) ==== @@ -40,7 +40,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 + * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#22 (text+ko) ==== @@ -59,8 +59,8 @@ #include <sys/ktr.h> #include <sys/mbuf.h> #include <sys/mutex.h> +#include <sys/smp.h> #include <sys/sf_buf.h> -#include <sys/smp.h> #include <sys/sysctl.h> #include <sys/unistd.h> ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#11 (text+ko) ==== @@ -84,8 +84,8 @@ static const char * legacy_pcib_is_host_bridge(int bus, int slot, int func, - u_int32_t id, u_int8_t class, u_int8_t subclass, - u_int8_t *busnum) + u_int32_t id, u_int8_t class, u_int8_t subclass, + u_int8_t *busnum) { const char *s = NULL; static u_int8_t pxb[4]; /* hack for 450nx */ ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#8 (text+ko) ==== @@ -346,3 +346,4 @@ devmax = 0; return (cfgmech); } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200312012119.hB1LJT9f068209>