mm/hwpoison: remove MF_MSG_BUDDY_2ND and MF_MSG_POISONED_HUGE

These action_page_types are no longer used, so remove them.

Link: https://lkml.kernel.org/r/20211115084006.3728254-3-naoya.horiguchi@linux.dev
Signed-off-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Acked-by: Yang Shi <shy828301@gmail.com>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Ding Hui <dinghui@sangfor.com.cn>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Peter Xu <peterx@redhat.com>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index eb67eb699b7852a78fb3538c1ad01282a522caea..7f594da84acac734df91acd8cccd78bd18976ce5 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -3201,7 +3201,6 @@ enum mf_action_page_type {
        MF_MSG_KERNEL_HIGH_ORDER,
        MF_MSG_SLAB,
        MF_MSG_DIFFERENT_COMPOUND,
-       MF_MSG_POISONED_HUGE,
        MF_MSG_HUGE,
        MF_MSG_FREE_HUGE,
        MF_MSG_NON_PMD_HUGE,
@@ -3216,7 +3215,6 @@ enum mf_action_page_type {
        MF_MSG_CLEAN_LRU,
        MF_MSG_TRUNCATED_LRU,
        MF_MSG_BUDDY,
-       MF_MSG_BUDDY_2ND,
        MF_MSG_DAX,
        MF_MSG_UNSPLIT_THP,
        MF_MSG_UNKNOWN,

diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h
index 0bdbc0d17d2fa2c32375b3da4a42e57ba6c22542..d0337a41141c84da69d043c255c1b17fc0acf8dd 100644 (file)
--- a/include/ras/ras_event.h
+++ b/include/ras/ras_event.h
@@ -358,7 +358,6 @@ TRACE_EVENT(aer_event,
        EM ( MF_MSG_KERNEL_HIGH_ORDER, "high-order kernel page" )       \
        EM ( MF_MSG_SLAB, "kernel slab page" )                          \
        EM ( MF_MSG_DIFFERENT_COMPOUND, "different compound page after locking" ) \
-       EM ( MF_MSG_POISONED_HUGE, "huge page already hardware poisoned" )      \
        EM ( MF_MSG_HUGE, "huge page" )                                 \
        EM ( MF_MSG_FREE_HUGE, "free huge page" )                       \
        EM ( MF_MSG_NON_PMD_HUGE, "non-pmd-sized huge page" )           \
@@ -373,7 +372,6 @@ TRACE_EVENT(aer_event,
        EM ( MF_MSG_CLEAN_LRU, "clean LRU page" )                       \
        EM ( MF_MSG_TRUNCATED_LRU, "already truncated LRU page" )       \
        EM ( MF_MSG_BUDDY, "free buddy page" )                          \
-       EM ( MF_MSG_BUDDY_2ND, "free buddy page (2nd try)" )            \
        EM ( MF_MSG_DAX, "dax page" )                                   \
        EM ( MF_MSG_UNSPLIT_THP, "unsplit thp" )                        \
        EMe ( MF_MSG_UNKNOWN, "unknown page" )

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 607785491a52c6af1fd10d087ee433c7a3f13dd6..810328fe8adbecbf780d0753778b5c02762affe0 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -723,7 +723,6 @@ static const char * const action_page_types[] = {
        [MF_MSG_KERNEL_HIGH_ORDER]      = "high-order kernel page",
        [MF_MSG_SLAB]                   = "kernel slab page",
        [MF_MSG_DIFFERENT_COMPOUND]     = "different compound page after locking",
-       [MF_MSG_POISONED_HUGE]          = "huge page already hardware poisoned",
        [MF_MSG_HUGE]                   = "huge page",
        [MF_MSG_FREE_HUGE]              = "free huge page",
        [MF_MSG_NON_PMD_HUGE]           = "non-pmd-sized huge page",
@@ -738,7 +737,6 @@ static const char * const action_page_types[] = {
        [MF_MSG_CLEAN_LRU]              = "clean LRU page",
        [MF_MSG_TRUNCATED_LRU]          = "already truncated LRU page",
        [MF_MSG_BUDDY]                  = "free buddy page",
-       [MF_MSG_BUDDY_2ND]              = "free buddy page (2nd try)",
        [MF_MSG_DAX]                    = "dax page",
        [MF_MSG_UNSPLIT_THP]            = "unsplit thp",
        [MF_MSG_UNKNOWN]                = "unknown page",