patch-2.4.6 linux/mm/numa.c
Next file: linux/mm/page_alloc.c
Previous file: linux/mm/memory.c
Back to the patch index
Back to the overall index
- Lines: 26
- Date:
Mon Jul 2 14:12:20 2001
- Orig file:
v2.4.5/linux/mm/numa.c
- Orig date:
Mon Oct 16 15:25:45 2000
diff -u --recursive --new-file v2.4.5/linux/mm/numa.c linux/mm/numa.c
@@ -34,7 +34,7 @@
struct page * alloc_pages_node(int nid, int gfp_mask, unsigned long order)
{
#ifdef CONFIG_NUMA
- return __alloc_pages(NODE_DATA(nid)->node_zonelists + gfp_mask, order);
+ return __alloc_pages(gfp_mask, order, NODE_DATA(nid)->node_zonelists + (gfp_mask & GFP_ZONEMASK));
#else
return alloc_pages(gfp_mask, order);
#endif
@@ -85,14 +85,14 @@
static struct page * alloc_pages_pgdat(pg_data_t *pgdat, int gfp_mask,
unsigned long order)
{
- return __alloc_pages(pgdat->node_zonelists + gfp_mask, order);
+ return __alloc_pages(gfp_mask, order, pgdat->node_zonelists + (gfp_mask & GFP_ZONEMASK));
}
/*
* This can be refined. Currently, tries to do round robin, instead
* should do concentratic circle search, starting from current node.
*/
-struct page * alloc_pages(int gfp_mask, unsigned long order)
+struct page * _alloc_pages(unsigned int gfp_mask, unsigned long order)
{
struct page *ret = 0;
pg_data_t *start, *temp;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)