mm/memory-failure: remove MF_MSG_SLAB

Since commit 46df8e73a4a3 ("mm: free up PG_slab"), MF_MSG_SLAB becomes
unused.  Remove it.  No functional change intended.

Link: https://lkml.kernel.org/r/20240612071835.157004-3-linmiaohe@huawei.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Cc: Borislav Petkov (AMD) <bp@alien8.de>
Cc: David Hildenbrand <david@redhat.com>
Cc: kernel test robot <lkp@intel.com>
Cc: Naoya Horiguchi <nao.horiguchi@gmail.com>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 7f864d5f52b7507468f3e6ad6f83270417f31e60..8a38adaf5480c0592bccc5fa92dc9e8459d1833d 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -4067,7 +4067,6 @@ enum mf_result {
 enum mf_action_page_type {
        MF_MSG_KERNEL,
        MF_MSG_KERNEL_HIGH_ORDER,
-       MF_MSG_SLAB,
        MF_MSG_DIFFERENT_COMPOUND,
        MF_MSG_HUGE,
        MF_MSG_FREE_HUGE,

diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h
index cf7f19b7ce64c446c2ed9303310d7f9884772cac..9bc707fe881900b44710ceba235874b0452b25f9 100644 (file)
--- a/include/ras/ras_event.h
+++ b/include/ras/ras_event.h
@@ -356,7 +356,6 @@ TRACE_EVENT(aer_event,
 #define MF_PAGE_TYPE           \
        EM ( MF_MSG_KERNEL, "reserved kernel page" )                    \
        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_HUGE, "huge page" )                                 \
        EM ( MF_MSG_FREE_HUGE, "free huge page" )                       \

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 2e6038c731194e57b1e39e1d1560945e50bb8866..4b9a9298d478ae2c56c79055d57a47581e2078c9 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -911,7 +911,6 @@ static const char *action_name[] = {
 static const char * const action_page_types[] = {
        [MF_MSG_KERNEL]                 = "reserved kernel page",
        [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_HUGE]                   = "huge page",
        [MF_MSG_FREE_HUGE]              = "free huge page",