The patch titled
Subject: mm-hwpoison-dissolve-in-use-hugepage-in-unrecoverable-memory-error-fix
has been removed from the -mm tree. Its filename was
mm-hwpoison-dissolve-in-use-hugepage-in-unrecoverable-memory-error-fix.patch
This patch was dropped because it was folded into mm-hwpoison-dissolve-in-use-hugepage-in-unrecoverable-memory-error.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-hwpoison-dissolve-in-use-hugepage-in-unrecoverable-memory-error-fix
fix unused var warnings
Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory-failure.c | 3 ---
1 file changed, 3 deletions(-)
diff -puN mm/memory-failure.c~mm-hwpoison-dissolve-in-use-hugepage-in-unrecoverable-memory-error-fix mm/memory-failure.c
--- a/mm/memory-failure.c~mm-hwpoison-dissolve-in-use-hugepage-in-unrecoverable-memory-error-fix
+++ a/mm/memory-failure.c
@@ -611,7 +611,6 @@ static int me_unknown(struct page *p, un
*/
static int me_pagecache_clean(struct page *p, unsigned long pfn)
{
- int err;
struct address_space *mapping;
delete_from_lru_cache(p);
@@ -758,8 +757,6 @@ static int me_huge_page(struct page *p,
if (mapping) {
res = truncate_error_page(hpage, pfn, mapping);
} else {
- int dissolve_ret;
-
unlock_page(hpage);
/*
* migration entry prevents later access on error anonymous
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-hwpoison-dissolve-in-use-hugepage-in-unrecoverable-memory-error.patch
mm-hugetlb-warn-the-user-when-issues-arise-on-boot-due-to-hugepages-fix.patch
mm-improve-readability-of-transparent_hugepage_enabled-fix.patch
mm-improve-readability-of-transparent_hugepage_enabled-fix-fix.patch
hugetlb-memory_hotplug-prefer-to-use-reserved-pages-for-migration-fix.patch
mm-page_allocc-eliminate-unsigned-confusion-in-__rmqueue_fallback-fix.patch
mm-zsmalloc-simplify-zs_max_alloc_size-handling-fix.patch
signal-avoid-undefined-behaviour-in-kill_something_info-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
