Changeset 7943c43 in mainline for kernel/arch
- Timestamp:
- 2012-01-16T22:45:38Z (14 years ago)
- 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. - Location:
- kernel/arch
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/arm32/src/mm/frame.c
r9117ef9b r7943c43 60 60 } else { 61 61 pfn_t conf = zone_external_conf_alloc(SIZE2FRAMES(size)); 62 63 zone_create(ADDR2PFN(base), SIZE2FRAMES(size), conf,64 ZONE_AVAILABLE | ZONE_HIGHMEM);62 if (conf != 0) 63 zone_create(ADDR2PFN(base), SIZE2FRAMES(size), conf, 64 ZONE_AVAILABLE | ZONE_HIGHMEM); 65 65 } 66 66 -
kernel/arch/ia32/src/mm/frame.c
r9117ef9b r7943c43 92 92 } else { 93 93 conf = zone_external_conf_alloc(count); 94 zone_create(pfn, count, conf, 95 ZONE_AVAILABLE | ZONE_HIGHMEM); 94 if (conf != 0) 95 zone_create(pfn, count, conf, 96 ZONE_AVAILABLE | ZONE_HIGHMEM); 96 97 } 97 98 } else if ((e820table[i].type == MEMMAP_MEMORY_ACPI) || -
kernel/arch/ia64/src/mm/frame.c
r9117ef9b r7943c43 79 79 ZONE_AVAILABLE | ZONE_LOWMEM); 80 80 } else { 81 pfn_t conf; 82 83 conf = zone_external_conf_alloc(count); 84 zone_create(pfn, count, conf, 85 ZONE_AVAILABLE | ZONE_HIGHMEM); 81 pfn_t conf = zone_external_conf_alloc(count); 82 if (conf != 0) 83 zone_create(pfn, count, conf, 84 ZONE_AVAILABLE | ZONE_HIGHMEM); 86 85 } 87 86 } -
kernel/arch/mips32/src/mm/frame.c
r9117ef9b r7943c43 156 156 } else { 157 157 conf_frame = zone_external_conf_alloc(count); 158 zone_create(first, count, conf_frame,159 ZONE_AVAILABLE | ZONE_HIGHMEM);160 }161 162 158 if (conf_frame != 0) 159 zone_create(first, count, conf_frame, 160 ZONE_AVAILABLE | ZONE_HIGHMEM); 161 } 162 163 163 if (phys_regions_count < MAX_REGIONS) { 164 164 phys_regions[phys_regions_count].start = first; -
kernel/arch/mips64/src/mm/frame.c
r9117ef9b r7943c43 148 148 } else { 149 149 conf_frame = zone_external_conf_alloc(count); 150 zone_create(first, count, conf_frame,151 ZONE_AVAILABLE | ZONE_HIGHMEM);152 }153 154 150 if (conf_frame != 0) 151 zone_create(first, count, conf_frame, 152 ZONE_AVAILABLE | ZONE_HIGHMEM); 153 } 154 155 155 if (phys_regions_count < MAX_REGIONS) { 156 156 phys_regions[phys_regions_count].start = first; -
kernel/arch/ppc32/src/mm/frame.c
r9117ef9b r7943c43 81 81 } else { 82 82 conf = zone_external_conf_alloc(count); 83 zone_create(pfn, count, conf, 84 ZONE_AVAILABLE | ZONE_HIGHMEM); 83 if (conf != 0) 84 zone_create(pfn, count, conf, 85 ZONE_AVAILABLE | ZONE_HIGHMEM); 85 86 } 86 87 } -
kernel/arch/sparc64/src/mm/sun4u/frame.c
r9117ef9b r7943c43 79 79 } else { 80 80 confdata = zone_external_conf_alloc(count); 81 zone_create(pfn, count, confdata, 82 ZONE_AVAILABLE | ZONE_HIGHMEM); 81 if (confdata != 0) 82 zone_create(pfn, count, confdata, 83 ZONE_AVAILABLE | ZONE_HIGHMEM); 83 84 } 84 85 } 85 86 86 } 87 87 -
kernel/arch/sparc64/src/mm/sun4v/frame.c
r9117ef9b r7943c43 79 79 } else { 80 80 confdata = zone_external_conf_alloc(count); 81 zone_create(pfn, count, confdata, 82 ZONE_AVAILABLE | ZONE_HIGHMEM); 81 if (confdata != 0) 82 zone_create(pfn, count, confdata, 83 ZONE_AVAILABLE | ZONE_HIGHMEM); 83 84 } 84 85 } 85 86 86 } 87 87
Note:
See TracChangeset
for help on using the changeset viewer.