Changeset 381465e in mainline

Timestamp:

2006-05-09T18:10:07Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

f6a0f06

Parents:

31282f9

Message:

zone_merge_all must be called after frame_init is completed - otherwise
new zone information can be allocated over the not-yet-blacklisted areas.

Location:

arch

Files:

• amd64/src/amd64.c (modified) (1 diff)
• ia32/src/ia32.c (modified) (1 diff)
• ia32/src/mm/frame.c (modified) (1 diff)

arch/amd64/src/amd64.c

@@ -135 +135 @@
         if (config.cpu_active == 1) {
 #ifdef CONFIG_FB
-        if (vesa_present()) vesa_init();
-        else
+                if (vesa_present()) 
+                        vesa_init();
+                else
 #endif
-                ega_init();     /* video */
+                        ega_init();     /* video */
                 /* Enable debugger */
                 debugger_init();
+                /* Merge all memory zones to 1 big zone */
+                zone_merge_all();
         }
         /* Setup fast SYSCALL/SYSRET */

arch/ia32/src/ia32.c

@@ -79 +79 @@
 
 #ifdef CONFIG_FB
-                if (vesa_present()) vesa_init();
+                if (vesa_present()) 
+                        vesa_init();
                 else
 #endif
-                ega_init();     /* video */
+                        ega_init();     /* video */
                 
                 
                 /* Enable debugger */
                 debugger_init();
+                /* Merge all memory zones to 1 big zone */
+                zone_merge_all();
         }
 }

arch/ia32/src/mm/frame.c

@@ -134 +134 @@
 #endif
 #endif
-                /* Merge all zones to 1 big zone */
-                zone_merge_all();
         }
 }