Changeset bb68433 in mainline for arch/ia32/src

Timestamp:

2006-02-08T22:58:06Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

7e4e532

Parents:

85dc2e7

Message:

Changed malloc to include second parameter and documented
recommended usage.
Added zone merging, made ia32 & amd64 to merge found zones.

Location:

arch/ia32/src

Files:

• mm/frame.c (modified) (1 diff)
• pm.c (modified) (1 diff)
• smp/smp.c (modified) (1 diff)

arch/ia32/src/mm/frame.c

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

arch/ia32/src/pm.c

@@ -191 +191 @@
         }
         else {
-                tss_p = (struct tss *) malloc(sizeof(struct tss));
+                tss_p = (struct tss *) malloc(sizeof(struct tss),FRAME_ATOMIC);
                 if (!tss_p)
                         panic("could not allocate TSS\n");

arch/ia32/src/smp/smp.c

@@ -139 +139 @@
                  * Prepare new GDT for CPU in question.
                  */
-                if (!(gdt_new = (struct descriptor *) malloc(GDT_ITEMS*sizeof(struct descriptor))))
+                if (!(gdt_new = (struct descriptor *) malloc(GDT_ITEMS*sizeof(struct descriptor), FRAME_ATOMIC)))
                         panic("couldn't allocate memory for GDT\n");