From owner-p4-projects@FreeBSD.ORG Tue Jun 28 19:39:01 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 45C0316A420; Tue, 28 Jun 2005 19:39:01 +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 203F616A41C for ; Tue, 28 Jun 2005 19:39:01 +0000 (GMT) (envelope-from ps@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AC8043D1F for ; Tue, 28 Jun 2005 19:39:01 +0000 (GMT) (envelope-from ps@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 j5SJd0tD097994 for ; Tue, 28 Jun 2005 19:39:00 GMT (envelope-from ps@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5SJd0Sk097989 for perforce@freebsd.org; Tue, 28 Jun 2005 19:39:00 GMT (envelope-from ps@freebsd.org) Date: Tue, 28 Jun 2005 19:39:00 GMT Message-Id: <200506281939.j5SJd0Sk097989@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ps@freebsd.org using -f From: Paul Saab To: Perforce Change Reviews Cc: Subject: PERFORCE change 79101 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: Tue, 28 Jun 2005 19:39:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=79101 Change 79101 by ps@butter.corp on 2005/06/28 19:38:37 kernphys is no longer useful to export so nuke it. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#135 edit .. //depot/projects/hammer/sys/i386/i386/machdep.c#60 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#135 (text+ko) ==== @@ -850,8 +850,6 @@ u_int basemem; -static vm_paddr_t kernphys[2]; - /* * Populate the (physmap) array with base/bound pairs describing the * available physical memory in the system, then test this memory and @@ -996,12 +994,6 @@ dcons_addr = 0; /* - * Keep track of where the kernel lives for crash dumps. - */ - kernphys[0] = 0x100000; - kernphys[1] = first; - - /* * physmap is in bytes, so when converting to page boundaries, * round up the start address and round down the end address. */ @@ -1019,7 +1011,7 @@ /* * block out kernel memory as not available. */ - if (pa >= kernphys[0] && pa < kernphys[1]) + if (pa >= 0x100000 && pa < first) goto do_dump_avail; /* ==== //depot/projects/hammer/sys/i386/i386/machdep.c#60 (text+ko) ==== @@ -186,7 +186,6 @@ vm_paddr_t phys_avail[10]; vm_paddr_t dump_avail[10]; -static vm_paddr_t kernphys[2]; /* must be 2 less so 0 0 can signal end of chunks */ #define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(phys_avail[0])) - 2) @@ -1885,12 +1884,6 @@ dcons_addr = 0; /* - * Keep track of where the kernel lives for crash dumps. - */ - kernphys[0] = KERNLOAD; - kernphys[1] = first; - - /* * physmap is in bytes, so when converting to page boundaries, * round up the start address and round down the end address. */ @@ -1908,7 +1901,7 @@ /* * block out kernel memory as not available. */ - if (pa >= kernphys[0] && pa < kernphys[1]) + if (pa >= KERNLOAD && pa < first) goto do_dump_avail; /*