Merge branch 'master'

[linux-2.6] / fs / buffer.c

diff --git a/fs/buffer.c b/fs/buffer.c
index 9657696fd6d71f23d462a171f3ff1d08f9052027..b1667986442f130b9fe523b85f174966100cd09e 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -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;