diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-26 13:13:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-26 13:13:19 -0400 |
| commit | c226951b93f7cd7c3a10b17384535b617bd43fd0 (patch) | |
| tree | 07b8796a5c99fbbf587b8d0dbcbc173cfe5e381e /mm/migrate.c | |
| parent | b0df3bd1e553e901ec7297267611a5db88240b38 (diff) | |
| parent | e8216dee838c09776680a6f1a2e54d81f3cdfa14 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'mm/migrate.c')
| -rw-r--r-- | mm/migrate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index 3f1e0c2c942c..20a8c2687b1e 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
| @@ -741,7 +741,7 @@ static struct page *new_page_node(struct page *p, unsigned long private, | |||
| 741 | 741 | ||
| 742 | *result = &pm->status; | 742 | *result = &pm->status; |
| 743 | 743 | ||
| 744 | return alloc_pages_node(pm->node, GFP_HIGHUSER, 0); | 744 | return alloc_pages_node(pm->node, GFP_HIGHUSER | GFP_THISNODE, 0); |
| 745 | } | 745 | } |
| 746 | 746 | ||
| 747 | /* | 747 | /* |