Changeset f6a0f06 in mainline

Timestamp:

2006-05-09T18:34:32Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

cfffb000

Parents:

381465e

Message:

Fix zone_merge_all in ppc architectures.

Location:

arch

Files:

• ppc32/src/mm/frame.c (modified) (1 diff)
• ppc32/src/ppc32.c (modified) (1 diff)
• ppc64/src/mm/frame.c (modified) (1 diff)
• ppc64/src/ppc64.c (modified) (1 diff)

arch/ppc32/src/mm/frame.c

@@ -60 +60 @@
         frame_mark_unavailable(0, 4);
         
-        /* Merge all zones to 1 big zone */
-        zone_merge_all();
 }

arch/ppc32/src/ppc32.c

@@ -60 +60 @@
 void arch_post_mm_init(void)
 {
+        if (config.cpu_active == 1) {
+                /* Merge all zones to 1 big zone */
+                zone_merge_all();
+        }
 }
 

arch/ppc64/src/mm/frame.c

@@ -60 +60 @@
         frame_mark_unavailable(0, 4);
         
-        /* Merge all zones to 1 big zone */
-        zone_merge_all();
 }

arch/ppc64/src/ppc64.c

@@ -48 +48 @@
 void arch_post_mm_init(void)
 {
+        if (config.cpu_active == 1) {
+                /* Merge all zones to 1 big zone */
+                zone_merge_all();
+        }
 }