Changeset 3c56c94 in mainline

Timestamp:

2005-09-01T16:21:05Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2793442

Parents:

69bd642

Message:

Do not use the unmapped addresses of e820 kernel structures.
Use PA2KA() to access the e820 counter and memtable.

File:

• arch/ia32/src/mm/memory_init.c (modified) (2 diffs)

arch/ia32/src/mm/memory_init.c

@@ -29 +29 @@
 #include <arch/boot/memmap.h>
 #include <arch/mm/memory_init.h>
+#include <arch/mm/page.h>
 #include <print.h>
 
@@ -40 +41 @@
         __u8 i;
         
-        for (i=e820counter;i>0;i--) {
-                printf("E820 base: %Q size: %Q type: ", e820table[i-1].base_address, e820table[i-1].size);
-                switch (e820table[i-1].type) {
+        /*
+         * We must not work with the original addresses for they are not mapped anymore.
+         */
+        struct e820memmap_ *memtable = (struct e820memmap_ *) PA2KA(e820table);
+        __u32 *counter_p = (__u32 *) PA2KA(&e820counter);
+        
+        
+        for (i=*counter_p;i>0;i--) {
+                printf("E820 base: %Q size: %Q type: ", memtable[i-1].base_address, memtable[i-1].size);
+                switch (memtable[i-1].type) {
                         case MEMMAP_MEMORY_AVAILABLE: 
                                 printf("available memory\n");