diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 19:13:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 19:13:16 +0200 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /fs/buffer.c | |
| parent | [PATCH] Fix documentation of driver suspend/resume callbacks (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-mmc (diff) | |
| download | linux-6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5.tar.xz linux-6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5.zip | |
Merge ../bleed-2.6
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 1216c0d3c8ce..b1667986442f 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -502,7 +502,7 @@ static void free_more_memory(void) yield(); for_each_pgdat(pgdat) { - zones = pgdat->node_zonelists[GFP_NOFS&GFP_ZONEMASK].zones; + zones = pgdat->node_zonelists[gfp_zone(GFP_NOFS)].zones; if (*zones) try_to_free_pages(zones, GFP_NOFS); } @@ -1571,7 +1571,7 @@ static inline void discard_buffer(struct buffer_head * bh) * * NOTE: @gfp_mask may go away, and this function may become non-blocking. */ -int try_to_release_page(struct page *page, int gfp_mask) +int try_to_release_page(struct page *page, gfp_t gfp_mask) { struct address_space * const mapping = page->mapping; |