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 <start, size>.
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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
