diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
| commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
| tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /arch/um/kernel/mem.c | |
| parent | 193515d51ccb363165d6b09e9ba5c21089e34bad (diff) | |
| parent | 330d57fb98a916fa8e1363846540dd420e99499a (diff) | |
Merge branch 'master'
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 | /* |