diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-11-07 12:05:22 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-11-07 12:05:22 -0500 |
| commit | 0ad3a96f8ad910ecf87a25ec69ed360b284dee2e (patch) | |
| tree | 12d292fd58fc0f7a3eb56c89dfc23569f3ab6c00 /arch/um/kernel/mem.c | |
| parent | f79b348856fbaf77e4a0c5cb08a808e5879967a9 (diff) | |
| parent | 5b2f7ffcb734d3046144dfbd5ac6d76254a9e522 (diff) | |
Auto-update from upstream
Diffstat (limited to 'arch/um/kernel/mem.c')
| -rw-r--r-- | arch/um/kernel/mem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index 462cc9d65386..fa4f915be5c5 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c | |||
| @@ -234,8 +234,8 @@ void paging_init(void) | |||
| 234 | empty_bad_page = (unsigned long *) alloc_bootmem_low_pages(PAGE_SIZE); | 234 | empty_bad_page = (unsigned long *) alloc_bootmem_low_pages(PAGE_SIZE); |
| 235 | for(i=0;i<sizeof(zones_size)/sizeof(zones_size[0]);i++) | 235 | for(i=0;i<sizeof(zones_size)/sizeof(zones_size[0]);i++) |
| 236 | zones_size[i] = 0; | 236 | zones_size[i] = 0; |
| 237 | zones_size[0] = (end_iomem >> PAGE_SHIFT) - (uml_physmem >> PAGE_SHIFT); | 237 | zones_size[ZONE_DMA] = (end_iomem >> PAGE_SHIFT) - (uml_physmem >> PAGE_SHIFT); |
| 238 | zones_size[2] = highmem >> PAGE_SHIFT; | 238 | zones_size[ZONE_HIGHMEM] = highmem >> PAGE_SHIFT; |
| 239 | free_area_init(zones_size); | 239 | free_area_init(zones_size); |
| 240 | 240 | ||
| 241 | /* | 241 | /* |