Changeset 08cc26b in mainline

Timestamp:

2012-01-23T12:21:48Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

304faab

Parents:

fcae007 (diff), 49ec568 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

File:

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

kernel/arch/ia32/src/mm/frame.c

@@ -46 +46 @@
 #include <print.h>
 
+#define PHYSMEM_LIMIT32  UINT64_C(0x100000000)
+
 size_t hardcoded_unmapped_ktext_size = 0;
 size_t hardcoded_unmapped_kdata_size = 0;
@@ -56 +58 @@
                 uint64_t base64 = e820table[i].base_address;
                 uint64_t size64 = e820table[i].size;
-
+                
 #ifdef KARCH_ia32
                 /*
                  * Restrict the e820 table entries to 32-bits.
                  */
-                if (base64 >= 0x100000000ULL)
+                if (base64 >= PHYSMEM_LIMIT32)
                         continue;
-                if (base64 + size64 > 0x100000000ULL)
-                        size64 -= base64 + size64 - 0x100000000ULL;
+                
+                if (base64 + size64 > PHYSMEM_LIMIT32)
+                        size64 = PHYSMEM_LIMIT32 - base64;
 #endif
-
+                
                 uintptr_t base = (uintptr_t) base64;
                 size_t size = (size_t) size64;