aboutsummaryrefslogtreecommitdiffstats
path: root/mm/page_alloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r--mm/page_alloc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 2410a3cb1c53..5b5cbb5e1816 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -70,7 +70,9 @@ static void __free_pages_ok(struct page *page, unsigned int order);
70 */ 70 */
71int sysctl_lowmem_reserve_ratio[MAX_NR_ZONES-1] = { 71int sysctl_lowmem_reserve_ratio[MAX_NR_ZONES-1] = {
72 256, 72 256,
73#ifdef CONFIG_ZONE_DMA32
73 256, 74 256,
75#endif
74 32 76 32
75}; 77};
76 78
@@ -85,7 +87,9 @@ EXPORT_SYMBOL(zone_table);
85 87
86static char *zone_names[MAX_NR_ZONES] = { 88static char *zone_names[MAX_NR_ZONES] = {
87 "DMA", 89 "DMA",
90#ifdef CONFIG_ZONE_DMA32
88 "DMA32", 91 "DMA32",
92#endif
89 "Normal", 93 "Normal",
90 "HighMem" 94 "HighMem"
91}; 95};
@@ -1373,8 +1377,10 @@ static inline int highest_zone(int zone_bits)
1373 int res = ZONE_NORMAL; 1377 int res = ZONE_NORMAL;
1374 if (zone_bits & (__force int)__GFP_HIGHMEM) 1378 if (zone_bits & (__force int)__GFP_HIGHMEM)
1375 res = ZONE_HIGHMEM; 1379 res = ZONE_HIGHMEM;
1380#ifdef CONFIG_ZONE_DMA32
1376 if (zone_bits & (__force int)__GFP_DMA32) 1381 if (zone_bits & (__force int)__GFP_DMA32)
1377 res = ZONE_DMA32; 1382 res = ZONE_DMA32;
1383#endif
1378 if (zone_bits & (__force int)__GFP_DMA) 1384 if (zone_bits & (__force int)__GFP_DMA)
1379 res = ZONE_DMA; 1385 res = ZONE_DMA;
1380 return res; 1386 return res;