diff --git a/debian/changelog b/debian/changelog index 0edc05813..ba1849ba5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ linux (3.14.12-2) UNRELEASED; urgency=medium * [mips,mipsel] Add a debconf note to warn users that they have to configure the system bootloader to load initramfs. + [ Ben Hutchings ] + * writeback: Fix ABI change in 3.14.10 (Closes: #754902) + -- Ian Campbell Sat, 12 Jul 2014 21:12:17 +0100 linux (3.14.12-1) unstable; urgency=medium diff --git a/debian/config/defines b/debian/config/defines index 431413009..554e5a9f1 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -24,8 +24,6 @@ ignore-changes: sock_diag_put_filterinfo # Can't build target modules OOT module:drivers/target/iscsi/iscsi_target_mod -# Apparently not used OOT - test_set_page_writeback [base] arches: diff --git a/debian/patches/debian/writeback-fix-abi-change-in-3.14.10.patch b/debian/patches/debian/writeback-fix-abi-change-in-3.14.10.patch new file mode 100644 index 000000000..705e454fa --- /dev/null +++ b/debian/patches/debian/writeback-fix-abi-change-in-3.14.10.patch @@ -0,0 +1,29 @@ +From: Ben Hutchings +Date: Wed, 16 Jul 2014 20:50:04 +0100 +Subject: writeback: Fix ABI change in 3.14.10 +Bug-Debian: https://bugs.debian.org/754902 +Forwarded: not-needed + +Commit 1c8349a17137 ("ext4: fix data integrity sync in ordered mode") +renamed test_set_page_writeback() to __test_set_page_writeback() and +added a function-macro under the old name as a wrapper. +test_set_page_writeback() was an exported function that is used by +some OOT modules including openafs. To keep old modules working, we +need to provide a real function as well. + +--- a/mm/page-writeback.c ++++ b/mm/page-writeback.c +@@ -2439,6 +2439,13 @@ int __test_set_page_writeback(struct pag + } + EXPORT_SYMBOL(__test_set_page_writeback); + ++#undef test_set_page_writeback ++int test_set_page_writeback(struct page *page) ++{ ++ return __test_set_page_writeback(page, false); ++} ++EXPORT_SYMBOL(test_set_page_writeback); ++ + /* + * Return true if any of the pages in the mapping are marked with the + * passed tag. diff --git a/debian/patches/series b/debian/patches/series index 04dfec425..227460719 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -96,3 +96,4 @@ debian/irq-avoid-abi-change-in-3.14.10.patch debian/ptrace-avoid-abi-change-in-3.14.10.patch debian/trace-syscall-avoid-abi-change-in-3.14.11.patch debian/blkcg-avoid-abi-change-in-3.14.12.patch +debian/writeback-fix-abi-change-in-3.14.10.patch