diff options
| author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2007-03-20 11:36:02 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2007-04-27 11:20:24 -0400 |
| commit | 05502339332564ffd545be9ca37b208296a2eaad (patch) | |
| tree | 18ccc05807e2998ddf25b3b359d680e41ff3c06a /arch/mips/mm/init.c | |
| parent | f197465384bf7ef1af184c2ed1a4e268911a91e3 (diff) | |
[MIPS] Select ZONE_DMA only if GENERIC_ISA_DMA selected
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mm/init.c')
| -rw-r--r-- | arch/mips/mm/init.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index e9951c0e689f..8800c88cbbf6 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
| @@ -351,18 +351,15 @@ void __init paging_init(void) | |||
| 351 | #endif | 351 | #endif |
| 352 | kmap_coherent_init(); | 352 | kmap_coherent_init(); |
| 353 | 353 | ||
| 354 | #ifdef CONFIG_ISA | 354 | #ifdef CONFIG_ZONE_DMA |
| 355 | if (max_low_pfn >= MAX_DMA_PFN) | 355 | if (min_low_pfn < MAX_DMA_PFN && MAX_DMA_PFN <= max_low_pfn) { |
| 356 | if (min_low_pfn >= MAX_DMA_PFN) { | 356 | zones_size[ZONE_DMA] = MAX_DMA_PFN - min_low_pfn; |
| 357 | zones_size[ZONE_DMA] = 0; | 357 | zones_size[ZONE_NORMAL] = max_low_pfn - MAX_DMA_PFN; |
| 358 | zones_size[ZONE_NORMAL] = max_low_pfn - min_low_pfn; | 358 | } else if (max_low_pfn < MAX_DMA_PFN) |
| 359 | } else { | 359 | zones_size[ZONE_DMA] = max_low_pfn - min_low_pfn; |
| 360 | zones_size[ZONE_DMA] = MAX_DMA_PFN - min_low_pfn; | ||
| 361 | zones_size[ZONE_NORMAL] = max_low_pfn - MAX_DMA_PFN; | ||
| 362 | } | ||
| 363 | else | 360 | else |
| 364 | #endif | 361 | #endif |
| 365 | zones_size[ZONE_DMA] = max_low_pfn - min_low_pfn; | 362 | zones_size[ZONE_NORMAL] = max_low_pfn - min_low_pfn; |
| 366 | 363 | ||
| 367 | #ifdef CONFIG_HIGHMEM | 364 | #ifdef CONFIG_HIGHMEM |
| 368 | zones_size[ZONE_HIGHMEM] = highend_pfn - highstart_pfn; | 365 | zones_size[ZONE_HIGHMEM] = highend_pfn - highstart_pfn; |