diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-12-11 20:52:41 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-12-11 20:52:41 +0000 |
commit | fa62f19c1ce2f853166e68e6748479e5949220e0 (patch) | |
tree | 12003e9906b3b376a90dc9d06a865aba51a04942 /c/src/lib/libcpu/i386 | |
parent | 2009-12-11 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-fa62f19c1ce2f853166e68e6748479e5949220e0.tar.bz2 |
2009-12-11 Joel Sherrill <joel.sherrill@oarcorp.com>
* page.c: Use bsp_mem_size.
Diffstat (limited to 'c/src/lib/libcpu/i386')
-rw-r--r-- | c/src/lib/libcpu/i386/ChangeLog | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/i386/page.c | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/c/src/lib/libcpu/i386/ChangeLog b/c/src/lib/libcpu/i386/ChangeLog index dee3545eaf..ec1f33f9a4 100644 --- a/c/src/lib/libcpu/i386/ChangeLog +++ b/c/src/lib/libcpu/i386/ChangeLog @@ -1,3 +1,7 @@ +2009-12-11 Joel Sherrill <joel.sherrill@oarcorp.com> + + * page.c: Use bsp_mem_size. + 2009-10-28 Till Straumann <strauman@slac.stanford.edu> * displayCpu.c: Fixed formatting for prettier printing; diff --git a/c/src/lib/libcpu/i386/page.c b/c/src/lib/libcpu/i386/page.c index 45d9aaadd2..2f08140429 100644 --- a/c/src/lib/libcpu/i386/page.c +++ b/c/src/lib/libcpu/i386/page.c @@ -31,8 +31,7 @@ static int directoryEntry=0; static int tableEntry=0; static page_directory *pageDirectory; -extern uint32_t rtemsFreeMemStart; - +extern uint32_t bsp_mem_size; /*************************************************************************/ /************** IT IS A ONE-TO-ONE TRANSLATION ***************************/ @@ -72,7 +71,6 @@ void _CPU_enable_paging(void) int init_paging(void) { - int memorySize; int nbPages; int nbInitPages; char *Tables; @@ -81,14 +79,8 @@ int init_paging(void) unsigned int physPage; int nbTables=0; - /* - * rtemsFreeMemStart is the last valid 32-bits address - * so the size is rtemsFreeMemStart + 4 - */ - memorySize = rtemsFreeMemStart + 4; - - nbPages = ( (memorySize - 1) / PG_SIZE ) + 1; - nbTables = ( (memorySize - 1) / FOUR_MB ) + 2; + nbPages = ( (bsp_mem_size - 1) / PG_SIZE ) + 1; + nbTables = ( (bsp_mem_size - 1) / FOUR_MB ) + 2; /* allocate 1 page more to page alignement */ Tables = (char *)malloc( (nbTables + 1)*sizeof(page_table) ); |