Changeset 3f03199 in mainline for kernel/arch/ia32/src/mm/frame.c

Timestamp:

2013-09-15T06:33:53Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

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

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

@@ -47 +47 @@
 
 #define PHYSMEM_LIMIT32  UINT64_C(0x100000000)
-#define PHYSMEM_LIMIT_DMA   UINT64_C(0x1000000)
 
 size_t hardcoded_unmapped_ktext_size = 0;
@@ -92 +91 @@
                                 else
                                         conf = minconf;
-
-                                if ((pfn * PAGE_SIZE) < PHYSMEM_LIMIT_DMA) {
-                                        size_t dma_count = min(
-                                            PHYSMEM_LIMIT_DMA / PAGE_SIZE - pfn,
-                                            count);
-                                        zone_create(pfn, dma_count, conf,
-                                            ZONE_AVAILABLE | ZONE_DMA);
-                                        count -= dma_count;
-                                        pfn += dma_count;
-                                }
-
-                                conf = pfn;
-                                if (count) {
-                                        zone_create(pfn, count, conf,
-                                            ZONE_AVAILABLE | ZONE_LOWMEM);
-                                }
+                                zone_create(pfn, count, conf,
+                                    ZONE_AVAILABLE | ZONE_LOWMEM);
                         } else {
                                 conf = zone_external_conf_alloc(count);
-                                if (conf != 0) {
+                                if (conf != 0)
                                         zone_create(pfn, count, conf,
                                             ZONE_AVAILABLE | ZONE_HIGHMEM);
-                                }
                         }
                 } else if ((e820table[i].type == MEMMAP_MEMORY_ACPI) ||