diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 15:02:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 15:02:58 +1100 |
| commit | d7eaf400f583154283e26244ee671585cd413156 (patch) | |
| tree | 6ac8efcd27bf4d9e8aef4862eeb0b45fca4a5187 /include/linux/mmdebug.h | |
| parent | 79b1d1f5860545973461d0dcb1f0e8d9c32dbdbe (diff) | |
| parent | f684c699592229c3aebf656363bcb0cf86df2570 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
fs/fs-writeback.c
Diffstat (limited to 'include/linux/mmdebug.h')
| -rw-r--r-- | include/linux/mmdebug.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mmdebug.h b/include/linux/mmdebug.h index 5042c036dda9..2d57efa64cc1 100644 --- a/include/linux/mmdebug.h +++ b/include/linux/mmdebug.h @@ -3,8 +3,8 @@ struct page; -extern void dump_page(struct page *page, char *reason); -extern void dump_page_badflags(struct page *page, char *reason, +extern void dump_page(struct page *page, const char *reason); +extern void dump_page_badflags(struct page *page, const char *reason, unsigned long badflags); #ifdef CONFIG_DEBUG_VM |