Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 320762
b: refs/heads/master
c: deaf386
h: refs/heads/master
v: v3
  • Loading branch information
Gavin Shan authored and Linus Torvalds committed Aug 1, 2012
1 parent 970dd14 commit 195ddbf
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 44de9d0cad41f2c51ef26916842be046b582dcc9
refs/heads/master: deaf386ee58d5336bbef8959bf304573afb67c20
14 changes: 7 additions & 7 deletions trunk/mm/page_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1529,16 +1529,16 @@ static int __init setup_fail_page_alloc(char *str)
}
__setup("fail_page_alloc=", setup_fail_page_alloc);

static int should_fail_alloc_page(gfp_t gfp_mask, unsigned int order)
static bool should_fail_alloc_page(gfp_t gfp_mask, unsigned int order)
{
if (order < fail_page_alloc.min_order)
return 0;
return false;
if (gfp_mask & __GFP_NOFAIL)
return 0;
return false;
if (fail_page_alloc.ignore_gfp_highmem && (gfp_mask & __GFP_HIGHMEM))
return 0;
return false;
if (fail_page_alloc.ignore_gfp_wait && (gfp_mask & __GFP_WAIT))
return 0;
return false;

return should_fail(&fail_page_alloc.attr, 1 << order);
}
Expand Down Expand Up @@ -1578,9 +1578,9 @@ late_initcall(fail_page_alloc_debugfs);

#else /* CONFIG_FAIL_PAGE_ALLOC */

static inline int should_fail_alloc_page(gfp_t gfp_mask, unsigned int order)
static inline bool should_fail_alloc_page(gfp_t gfp_mask, unsigned int order)
{
return 0;
return false;
}

#endif /* CONFIG_FAIL_PAGE_ALLOC */
Expand Down

0 comments on commit 195ddbf

Please sign in to comment.