Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 198236
b: refs/heads/master
c: e325c90
h: refs/heads/master
v: v3
  • Loading branch information
David Rientjes authored and Linus Torvalds committed May 25, 2010
1 parent b85fa9c commit 4f05c96
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1a5cb81465b66b74bf3d6ad36e5382238de6a132
refs/heads/master: e325c90ffc13b698fa2814102e05275b21c26bec
11 changes: 10 additions & 1 deletion trunk/mm/page_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2606,7 +2606,7 @@ static int default_zonelist_order(void)
* ZONE_DMA and ZONE_DMA32 can be very small area in the system.
* If they are really small and used heavily, the system can fall
* into OOM very easily.
* This function detect ZONE_DMA/DMA32 size and confgigures zone order.
* This function detect ZONE_DMA/DMA32 size and configures zone order.
*/
/* Is there ZONE_NORMAL ? (ex. ppc has only DMA zone..) */
low_kmem_size = 0;
Expand All @@ -2618,6 +2618,15 @@ static int default_zonelist_order(void)
if (zone_type < ZONE_NORMAL)
low_kmem_size += z->present_pages;
total_size += z->present_pages;
} else if (zone_type == ZONE_NORMAL) {
/*
* If any node has only lowmem, then node order
* is preferred to allow kernel allocations
* locally; otherwise, they can easily infringe
* on other nodes when there is an abundance of
* lowmem available to allocate from.
*/
return ZONELIST_ORDER_NODE;
}
}
}
Expand Down

0 comments on commit 4f05c96

Please sign in to comment.