From owner-svn-src-all@FreeBSD.ORG Thu Dec 9 07:47:41 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 491D71065679; Thu, 9 Dec 2010 07:47:41 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 37D888FC13; Thu, 9 Dec 2010 07:47:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB97lfsJ028360; Thu, 9 Dec 2010 07:47:41 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB97lfuh028351; Thu, 9 Dec 2010 07:47:41 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <201012090747.oB97lfuh028351@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Thu, 9 Dec 2010 07:47:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216320 - in head/sys/mips: adm5120 alchemy cavium idt malta rmi sentry5 sibyte X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Dec 2010 07:47:41 -0000 Author: gonzo Date: Thu Dec 9 07:47:40 2010 New Revision: 216320 URL: http://svn.freebsd.org/changeset/base/216320 Log: - dump_avail layout should be sequence of [start, end) pairs, not . Spotted by: alc@ Modified: head/sys/mips/adm5120/adm5120_machdep.c head/sys/mips/alchemy/alchemy_machdep.c head/sys/mips/cavium/octeon_machdep.c head/sys/mips/idt/idt_machdep.c head/sys/mips/malta/malta_machdep.c head/sys/mips/rmi/xlr_machdep.c head/sys/mips/sentry5/s5_machdep.c head/sys/mips/sibyte/sb_machdep.c Modified: head/sys/mips/adm5120/adm5120_machdep.c ============================================================================== --- head/sys/mips/adm5120/adm5120_machdep.c Thu Dec 9 07:39:06 2010 (r216319) +++ head/sys/mips/adm5120/adm5120_machdep.c Thu Dec 9 07:47:40 2010 (r216320) @@ -98,7 +98,7 @@ mips_init(void) phys_avail[1] = ctob(realmem); dump_avail[0] = phys_avail[0]; - dump_avail[1] = phys_avail[1] - phys_avail[0]; + dump_avail[1] = phys_avail[1]; physmem = realmem; Modified: head/sys/mips/alchemy/alchemy_machdep.c ============================================================================== --- head/sys/mips/alchemy/alchemy_machdep.c Thu Dec 9 07:39:06 2010 (r216319) +++ head/sys/mips/alchemy/alchemy_machdep.c Thu Dec 9 07:47:40 2010 (r216320) @@ -98,7 +98,7 @@ mips_init(void) phys_avail[1] = ctob(realmem); dump_avail[0] = phys_avail[0]; - dump_avail[1] = phys_avail[1] - phys_avail[0]; + dump_avail[1] = phys_avail[1]; physmem = realmem; Modified: head/sys/mips/cavium/octeon_machdep.c ============================================================================== --- head/sys/mips/cavium/octeon_machdep.c Thu Dec 9 07:39:06 2010 (r216319) +++ head/sys/mips/cavium/octeon_machdep.c Thu Dec 9 07:47:40 2010 (r216320) @@ -275,7 +275,7 @@ octeon_memory_init(void) phys_avail[1] = 96 << 20; dump_avail[0] = phys_avail[0]; - dump_avail[1] = phys_avail[1] - phys_avail[0]; + dump_avail[1] = phys_avail[1]; realmem = physmem = btoc(phys_avail[1] - phys_avail[0]); return; @@ -317,10 +317,8 @@ octeon_memory_init(void) i += 2; } - for (j = 0; j < i; j += 2) { + for (j = 0; j < i; j++) dump_avail[j] = phys_avail[j]; - dump_avail[j+1] = phys_avail[j+1] - phys_avail[j]; - } realmem = physmem; } Modified: head/sys/mips/idt/idt_machdep.c ============================================================================== --- head/sys/mips/idt/idt_machdep.c Thu Dec 9 07:39:06 2010 (r216319) +++ head/sys/mips/idt/idt_machdep.c Thu Dec 9 07:47:40 2010 (r216320) @@ -168,7 +168,7 @@ platform_start(__register_t a0, __regist phys_avail[1] = ctob(realmem); dump_avail[0] = phys_avail[0]; - dump_avail[1] = phys_avail[1] - phys_avail[0]; + dump_avail[1] = phys_avail[1]; physmem = realmem; Modified: head/sys/mips/malta/malta_machdep.c ============================================================================== --- head/sys/mips/malta/malta_machdep.c Thu Dec 9 07:39:06 2010 (r216319) +++ head/sys/mips/malta/malta_machdep.c Thu Dec 9 07:47:40 2010 (r216320) @@ -182,7 +182,7 @@ mips_init(void) phys_avail[1] = ctob(realmem); dump_avail[0] = phys_avail[0]; - dump_avail[1] = phys_avail[1] - phys_avail[0]; + dump_avail[1] = phys_avail[1]; physmem = realmem; Modified: head/sys/mips/rmi/xlr_machdep.c ============================================================================== --- head/sys/mips/rmi/xlr_machdep.c Thu Dec 9 07:39:06 2010 (r216319) +++ head/sys/mips/rmi/xlr_machdep.c Thu Dec 9 07:47:40 2010 (r216320) @@ -363,8 +363,8 @@ xlr_mem_init(void) (void *)phys_avail[0], (void *)phys_avail[1]); - dump_avail[0] = boot_map->physmem_map[0].addr; - dump_avail[1] = boot_map->physmem_map[0].size; + dump_avail[0] = phys_avail[0]; + dump_avail[1] = phys_avail[1]; } else { /* @@ -394,8 +394,8 @@ xlr_mem_init(void) (void *)phys_avail[j+1]); } - dump_avail[j] = boot_map->physmem_map[j].addr; - dump_avail[j+1] = boot_map->physmem_map[j].size; + dump_avail[j] = phys_avail[j]; + dump_avail[j+1] = phys_avail[j+1]; physsz += boot_map->physmem_map[i].size; } Modified: head/sys/mips/sentry5/s5_machdep.c ============================================================================== --- head/sys/mips/sentry5/s5_machdep.c Thu Dec 9 07:39:06 2010 (r216319) +++ head/sys/mips/sentry5/s5_machdep.c Thu Dec 9 07:47:40 2010 (r216320) @@ -128,10 +128,8 @@ mips_init(void) realmem = btoc(physmem); #endif - for (j = 0; j < i; j += 2) { + for (j = 0; j < i; j++) dump_avail[j] = phys_avail[j]; - dump_avail[j+1] = phys_avail[j+1] - phys_avail[j]; - } physmem = realmem; Modified: head/sys/mips/sibyte/sb_machdep.c ============================================================================== --- head/sys/mips/sibyte/sb_machdep.c Thu Dec 9 07:39:06 2010 (r216319) +++ head/sys/mips/sibyte/sb_machdep.c Thu Dec 9 07:47:40 2010 (r216320) @@ -225,10 +225,8 @@ mips_init(void) realmem = btoc(physmem); #endif - for (j = 0; j < i; j += 2) { + for (j = 0; j < i; j++) dump_avail[j] = phys_avail[j]; - dump_avail[j+1] = phys_avail[j+1] - phys_avail[j]; - } physmem = realmem;