diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-09 02:31:01 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-09 02:31:01 -0700 |
commit | d5a2a1ba838f60d92bf67c5eef533e95453752cb (patch) | |
tree | f6436b5e2b430197f37e49ffff23e91ef694b303 /mm/swap_state.c | |
parent | Merge tag 'omap-cleanup-hwmod-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup (diff) | |
parent | Linux 3.4-rc6 (diff) | |
download | linux-dev-d5a2a1ba838f60d92bf67c5eef533e95453752cb.tar.xz linux-dev-d5a2a1ba838f60d92bf67c5eef533e95453752cb.zip |
Merge tag 'v3.4-rc6' into next/cleanup
Linux 3.4-rc6
Resolve conflict where an u5500 file had a bugfix go in, but was
deleted in the branch staged for next merge window.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'mm/swap_state.c')
-rw-r--r-- | mm/swap_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/swap_state.c b/mm/swap_state.c index 9d3dd3763cf7..4c5ff7f284d9 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -26,7 +26,7 @@ */ static const struct address_space_operations swap_aops = { .writepage = swap_writepage, - .set_page_dirty = __set_page_dirty_nobuffers, + .set_page_dirty = __set_page_dirty_no_writeback, .migratepage = migrate_page, }; |