diff --git a/[refs] b/[refs] index c55eedfcd49d..622d6b2ec6b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 807501475fce0ebe68baedf87f202c3e4ee0d12c +refs/heads/master: 26defe34e48e18b058b773f60467729c64917490 diff --git a/trunk/drivers/block/brd.c b/trunk/drivers/block/brd.c index 85364804364f..7bd76639544c 100644 --- a/trunk/drivers/block/brd.c +++ b/trunk/drivers/block/brd.c @@ -108,7 +108,7 @@ static struct page *brd_insert_page(struct brd_device *brd, sector_t sector) #ifndef CONFIG_BLK_DEV_XIP gfp_flags |= __GFP_HIGHMEM; #endif - page = alloc_page(GFP_NOIO | __GFP_HIGHMEM | __GFP_ZERO); + page = alloc_page(gfp_flags); if (!page) return NULL;