diff options
author | Mark Brown <broonie@kernel.org> | 2020-12-11 17:48:50 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-12-11 17:48:50 +0000 |
commit | 58f7553fa424fd0fd74e8b796d50c66014cebebe (patch) | |
tree | 8aecb1d047b1df2abbfa1ef323d2a724a6a61c77 /include/ras | |
parent | dd91c555461261fed220ae29a508f508a0afeb43 (diff) | |
parent | 9326e4f1e5dd1a4410c429638d3c412b6fc17040 (diff) |
Merge remote-tracking branch 'spi/for-5.10' into spi-linus
Diffstat (limited to 'include/ras')
-rw-r--r-- | include/ras/ras_event.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h index 36c5c5e38c1d..0bdbc0d17d2f 100644 --- a/include/ras/ras_event.h +++ b/include/ras/ras_event.h @@ -361,6 +361,7 @@ TRACE_EVENT(aer_event, 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" ) \ EM ( MF_MSG_UNMAP_FAILED, "unmapping failed page" ) \ EM ( MF_MSG_DIRTY_SWAPCACHE, "dirty swapcache page" ) \ EM ( MF_MSG_CLEAN_SWAPCACHE, "clean swapcache page" ) \ @@ -373,6 +374,8 @@ TRACE_EVENT(aer_event, 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" ) /* |