diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-07-12 06:34:42 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-07-12 06:34:42 -0400 |
| commit | f2006e27396f55276f24434f56e208d86e7f9908 (patch) | |
| tree | 71896db916d33888b4286f80117d3cac0da40e6d /include/linux/buffer_head.h | |
| parent | e399eb56a6110e13f97e644658648602e2b08de7 (diff) | |
| parent | 9903883f1dd6e86f286b7bfa6e4b423f98c1cd9e (diff) | |
Merge branch 'linus' into timers/urgent
Get upstream changes so we can apply fixes against them
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/buffer_head.h')
| -rw-r--r-- | include/linux/buffer_head.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index f5a3b838ddb0..91fa9a94ae92 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h | |||
| @@ -139,6 +139,9 @@ BUFFER_FNS(Prio, prio) | |||
| 139 | }) | 139 | }) |
| 140 | #define page_has_buffers(page) PagePrivate(page) | 140 | #define page_has_buffers(page) PagePrivate(page) |
| 141 | 141 | ||
| 142 | void buffer_check_dirty_writeback(struct page *page, | ||
| 143 | bool *dirty, bool *writeback); | ||
| 144 | |||
| 142 | /* | 145 | /* |
| 143 | * Declarations | 146 | * Declarations |
| 144 | */ | 147 | */ |