diff --git a/0001-mm-rmap-fix-false-positive-VM_BUG-in-page_add_file_r.patch b/0001-mm-rmap-fix-false-positive-VM_BUG-in-page_add_file_r.patch deleted file mode 100644 index 276e2be..0000000 --- a/0001-mm-rmap-fix-false-positive-VM_BUG-in-page_add_file_r.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6abb0cfdc1f6a42367a20ac2baf4099fc8af08b5 Mon Sep 17 00:00:00 2001 -From: "Kirill A. Shutemov" -Date: Wed, 10 Aug 2016 09:54:30 -0700 -Subject: [PATCH] mm, rmap: fix false positive VM_BUG() in page_add_file_rmap() - -PageTransCompound() doesn't distinguish THP from from any other type of -compound pages. This can lead to false-positive VM_BUG_ON() in -page_add_file_rmap() if called on compound page from a driver[1]. - -I think we can exclude such cases by checking if the page belong to a -mapping. - -The VM_BUG_ON_PAGE() is downgraded to VM_WARN_ON_ONCE(). This path -should not cause any harm to non-THP page, but good to know if we step -on anything else. - -[1] -http://lkml.kernel.org/r/c711e067-0bff-a6cb-3c37-04dfe77d2db1@redhat.com - -Signed-off-by: Kirill A. Shutemov -Reported-by: Laura Abbott ---- - mm/rmap.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/mm/rmap.c b/mm/rmap.c -index 709bc83..d4f5606 100644 ---- a/mm/rmap.c -+++ b/mm/rmap.c -@@ -1284,8 +1284,9 @@ void page_add_file_rmap(struct page *page, bool compound) - VM_BUG_ON_PAGE(!PageSwapBacked(page), page); - __inc_node_page_state(page, NR_SHMEM_PMDMAPPED); - } else { -- if (PageTransCompound(page)) { -- VM_BUG_ON_PAGE(!PageLocked(page), page); -+ if (PageTransCompound(page) && page_mapping(page)) { -+ VM_WARN_ON_ONCE(!PageLocked(page)); -+ - SetPageDoubleMap(compound_head(page)); - if (PageMlocked(page)) - clear_page_mlock(compound_head(page)); --- -2.7.4 - diff --git a/gitrev b/gitrev index ac1b00e..9c2d58c 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -9512c47ec2e4f7e1f28ba66e09de536987a6057f +3b3ce01a57ad45d1ea4c63012d6f1e740d151d8d diff --git a/kernel.spec b/kernel.spec index 6587971..e21d870 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 1 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -602,9 +602,6 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch # https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org/message/A4YCP7OGMX6JLFT5V44H57GOMAQLC3M4/ Patch839: drm-i915-Acquire-audio-powerwell-for-HD-Audio-regist.patch -#rhbz 1365686 -Patch840: 0001-mm-rmap-fix-false-positive-VM_BUG-in-page_add_file_r.patch - #rhbz 1361414 Patch841: openstack_fix.patch @@ -2142,6 +2139,9 @@ fi # # %changelog +* Thu Aug 11 2016 Justin M. Forbes - 4.8.0-0.rc1.git4.1 +- Linux v4.8-rc1-88-g3b3ce01 + * Thu Aug 11 2016 Laura Abbott - Fix for crash seen with open stack (rhbz 1361414) diff --git a/sources b/sources index cf727b6..ffc2e80 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 5276563eb1f39a048e4a8a887408c031 linux-4.7.tar.xz fe259c02c75eec61d1aa4b1211f3c853 perf-man-4.7.tar.gz 6c8676e10b08ae2fec819e728ac4555e patch-4.8-rc1.xz -b5b666d0ceba21bccddaf55023f9f512 patch-4.8-rc1-git3.xz +fa336839feeb114432fcfeab9ea365a4 patch-4.8-rc1-git4.xz