From 03cc5666303b616ad18b63aa614681f1962a1f5e Mon Sep 17 00:00:00 2001 From: Naoya Horiguchi Date: Wed, 12 Dec 2012 13:52:33 -0800 Subject: [PATCH] --- yaml --- r: 343347 b: refs/heads/master c: 56f2fb147659e05b1e87b99791bf44b988d38545 h: refs/heads/master i: 343345: 57ec9d11e75ea82d050e23c896e425f0304a7121 343343: db5d6af9a7010aa32f1ac6a05af975576a389832 v: v3 --- [refs] | 2 +- trunk/mm/hugetlb.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f1957d508fa0..1719e1166f88 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f24ae585be985691c017b7ab90b3669dca32d6d +refs/heads/master: 56f2fb147659e05b1e87b99791bf44b988d38545 diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c index e53f39cd67db..22508ef943e6 100644 --- a/trunk/mm/hugetlb.c +++ b/trunk/mm/hugetlb.c @@ -3172,7 +3172,13 @@ int dequeue_hwpoisoned_huge_page(struct page *hpage) spin_lock(&hugetlb_lock); if (is_hugepage_on_freelist(hpage)) { - list_del(&hpage->lru); + /* + * Hwpoisoned hugepage isn't linked to activelist or freelist, + * but dangling hpage->lru can trigger list-debug warnings + * (this happens when we call unpoison_memory() on it), + * so let it point to itself with list_del_init(). + */ + list_del_init(&hpage->lru); set_page_refcounted(hpage); h->free_huge_pages--; h->free_huge_pages_node[nid]--;