summaryrefslogtreecommitdiff
path: root/Documentation/vm/hwpoison.rst
diff options
context:
space:
mode:
authorakpm <akpm@linux-foundation.org>2022-06-27 20:31:34 +0300
committerakpm <akpm@linux-foundation.org>2022-06-27 20:31:34 +0300
commit46a3b1125308f8f90a065eeecfafd2a96b01a36c (patch)
tree6e080118fbad5aa217d160cedf02f10108ce3bf2 /Documentation/vm/hwpoison.rst
parent6edda04ccc7cfb281d139e352dbd5dd933bd2751 (diff)
parent03c765b0e3b4cb5063276b086c76f7a612856a9a (diff)
downloadlinux-46a3b1125308f8f90a065eeecfafd2a96b01a36c.tar.xz
Merge branch 'master' into mm-stable
Diffstat (limited to 'Documentation/vm/hwpoison.rst')
-rw-r--r--Documentation/vm/hwpoison.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/vm/hwpoison.rst b/Documentation/vm/hwpoison.rst
index c742de1769d1..b9d5253c1305 100644
--- a/Documentation/vm/hwpoison.rst
+++ b/Documentation/vm/hwpoison.rst
@@ -120,7 +120,8 @@ Testing
unpoison-pfn
Software-unpoison page at PFN echoed into this file. This way
a page can be reused again. This only works for Linux
- injected failures, not for real memory failures.
+ injected failures, not for real memory failures. Once any hardware
+ memory failure happens, this feature is disabled.
Note these injection interfaces are not stable and might change between
kernel versions