Changeset 7943c43 in mainline for kernel/arch

Timestamp:

2012-01-16T22:45:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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 mainline changes.

Location:

kernel/arch

Files:

• arm32/src/mm/frame.c (modified) (1 diff)
• ia32/src/mm/frame.c (modified) (1 diff)
• ia64/src/mm/frame.c (modified) (1 diff)
• mips32/src/mm/frame.c (modified) (1 diff)
• mips64/src/mm/frame.c (modified) (1 diff)
• ppc32/src/mm/frame.c (modified) (1 diff)
• sparc64/src/mm/sun4u/frame.c (modified) (1 diff)
• sparc64/src/mm/sun4v/frame.c (modified) (1 diff)

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

@@ -60 +60 @@
         } else {
                 pfn_t conf = zone_external_conf_alloc(SIZE2FRAMES(size));
-
-                zone_create(ADDR2PFN(base), SIZE2FRAMES(size), conf,
-                    ZONE_AVAILABLE | ZONE_HIGHMEM);
+                if (conf != 0)
+                        zone_create(ADDR2PFN(base), SIZE2FRAMES(size), conf,
+                            ZONE_AVAILABLE | ZONE_HIGHMEM);
         }
         

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

@@ -92 +92 @@
                         } else {
                                 conf = zone_external_conf_alloc(count);
-                                zone_create(pfn, count, conf,
-                                    ZONE_AVAILABLE | ZONE_HIGHMEM);
+                                if (conf != 0)
+                                        zone_create(pfn, count, conf,
+                                            ZONE_AVAILABLE | ZONE_HIGHMEM);
                         }
                 } else if ((e820table[i].type == MEMMAP_MEMORY_ACPI) ||

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

@@ -79 +79 @@
                                     ZONE_AVAILABLE | ZONE_LOWMEM);
                         } else {
-                                pfn_t conf;
-
-                                conf = zone_external_conf_alloc(count);
-                                zone_create(pfn, count, conf,
-                                    ZONE_AVAILABLE | ZONE_HIGHMEM);
+                                pfn_t conf = zone_external_conf_alloc(count);
+                                if (conf != 0)
+                                        zone_create(pfn, count, conf,
+                                            ZONE_AVAILABLE | ZONE_HIGHMEM);
                         }
                 }

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

@@ -156 +156 @@
         } else {
                 conf_frame = zone_external_conf_alloc(count);
-                zone_create(first, count, conf_frame,
-                    ZONE_AVAILABLE | ZONE_HIGHMEM);
-        }
-                
-                
+                if (conf_frame != 0)
+                        zone_create(first, count, conf_frame,
+                            ZONE_AVAILABLE | ZONE_HIGHMEM);
+        }
+        
         if (phys_regions_count < MAX_REGIONS) {
                 phys_regions[phys_regions_count].start = first;

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

@@ -148 +148 @@
         } else {
                 conf_frame = zone_external_conf_alloc(count);
-                zone_create(first, count, conf_frame,
-                    ZONE_AVAILABLE | ZONE_HIGHMEM);
-        }
-                
-                
+                if (conf_frame != 0)
+                        zone_create(first, count, conf_frame,
+                            ZONE_AVAILABLE | ZONE_HIGHMEM);
+        }
+        
         if (phys_regions_count < MAX_REGIONS) {
                 phys_regions[phys_regions_count].start = first;

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

@@ -81 +81 @@
                 } else {
                         conf = zone_external_conf_alloc(count);
-                        zone_create(pfn, count, conf,
-                            ZONE_AVAILABLE | ZONE_HIGHMEM);
+                        if (conf != 0)
+                                zone_create(pfn, count, conf,
+                                    ZONE_AVAILABLE | ZONE_HIGHMEM);
                 }
         }

kernel/arch/sparc64/src/mm/sun4u/frame.c

@@ -79 +79 @@
                 } else {
                         confdata = zone_external_conf_alloc(count);
-                        zone_create(pfn, count, confdata,
-                            ZONE_AVAILABLE | ZONE_HIGHMEM);
+                        if (confdata != 0)
+                                zone_create(pfn, count, confdata,
+                                    ZONE_AVAILABLE | ZONE_HIGHMEM);
                 }
         }
-                
 }
 

kernel/arch/sparc64/src/mm/sun4v/frame.c

@@ -79 +79 @@
                 } else {
                         confdata = zone_external_conf_alloc(count);
-                        zone_create(pfn, count, confdata,
-                            ZONE_AVAILABLE | ZONE_HIGHMEM);
+                        if (confdata != 0)
+                                zone_create(pfn, count, confdata,
+                                    ZONE_AVAILABLE | ZONE_HIGHMEM);
                 }
         }
-                
 }