Author: royger
Date: Thu Dec 5 18:08:05 2013
New Revision: 258996
URL: http://svnweb.freebsd.org/changeset/base/258996
Log:
MFC 258176:
Fix accounting for hw.realmem on the i386 and amd64 platforms.
sys/i386/i386/machdep.c:
sys/amd64/amd64/machdep.c:
The value reported by FreeBSD as "real memory" when booting
doesn't match what is later reported by sysctl as hw.realmem.
This is due to the fact that the value printed during the
boot process is fetched from smbios data (when possible),
and accounts for holes in physical memory. On the other
hand, the value of hw.realmem is unconditionally set to be
one larger than the highest page of the physical address
space.
Fix this by setting hw.realmem to the same value printed
during boot, this makes hw.realmem honour it's name and
account properly for physical memory present in the system.
Submitted by: Roger Pau Monné
Reviewed by: gibbs
Approved by: gibbs (mentor)
Approved by: re (gjb)
Modified:
stable/10/sys/amd64/amd64/machdep.c
stable/10/sys/i386/i386/machdep.c
Directory Properties:
stable/10/sys/ (props changed)
Modified: stable/10/sys/amd64/amd64/machdep.c
==============================================================================
--- stable/10/sys/amd64/amd64/machdep.c Thu Dec 5 18:06:12 2013
(r258995)
+++ stable/10/sys/amd64/amd64/machdep.c Thu Dec 5 18:08:05 2013
(r258996)
@@ -256,7 +256,6 @@ cpu_startup(dummy)
#ifdef PERFMON
perfmon_init();
#endif
- realmem = Maxmem;
/*
* Display physical memory if SMBIOS reports reasonable amount.
@@ -270,6 +269,7 @@ cpu_startup(dummy)
if (memsize < ptoa((uintmax_t)cnt.v_free_count))
memsize = ptoa((uintmax_t)Maxmem);
printf("real memory = %ju (%ju MB)\n", memsize, memsize >> 20);
+ realmem = atop(memsize);
/*
* Display any holes after the first chunk of extended memory.
Modified: stable/10/sys/i386/i386/machdep.c
==============================================================================
--- stable/10/sys/i386/i386/machdep.c Thu Dec 5 18:06:12 2013
(r258995)
+++ stable/10/sys/i386/i386/machdep.c Thu Dec 5 18:08:05 2013
(r258996)
@@ -294,7 +294,6 @@ cpu_startup(dummy)
#ifdef PERFMON
perfmon_init();
#endif
- realmem = Maxmem;
/*
* Display physical memory if SMBIOS reports reasonable amount.
@@ -308,6 +307,7 @@ cpu_startup(dummy)
if (memsize < ptoa((uintmax_t)cnt.v_free_count))
memsize = ptoa((uintmax_t)Maxmem);
printf("real memory = %ju (%ju MB)\n", memsize, memsize >> 20);
+ realmem = atop(memsize);
/*
* Display any holes after the first chunk of extended memory.
_______________________________________________
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"
