summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-07-18 10:45:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-07-18 10:45:17 -0700
commit721db9dfb106f042294f40d2dbbd6c3613c3cd61 (patch)
tree562529f9ddd60235d712d954ddaafa26ba22ca04 /Documentation
parent6a70f89cc58f2368efa055cbcbd8b37384f6c588 (diff)
parentf0479c4bcbd92d1a457d4a43bcab79f29d11334a (diff)
downloadlwn-721db9dfb106f042294f40d2dbbd6c3613c3cd61.tar.gz
lwn-721db9dfb106f042294f40d2dbbd6c3613c3cd61.zip
Merge tag 'powerpc-5.8-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux into master
Pull powerpc fixes from Michael Ellerman: "Some more powerpc fixes for 5.8: - A fix to the VAS code we merged this cycle, to report the proper error code to userspace for address translation failures. And a selftest update to match. - Another fix for our pkey handling of PROT_EXEC mappings. - A fix for a crash when booting a "secure VM" under an ultravisor with certain numbers of CPUs. Thanks to: Aneesh Kumar K.V, Haren Myneni, Laurent Dufour, Sandipan Das, Satheesh Rajendran, Thiago Jung Bauermann" * tag 'powerpc-5.8-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: selftests/powerpc: Use proper error code to check fault address powerpc/vas: Report proper error code for address translation failure powerpc/pseries/svm: Fix incorrect check for shared_lppaca_size powerpc/book3s64/pkeys: Fix pkey_access_permitted() for execute disable pkey
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/powerpc/vas-api.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/powerpc/vas-api.rst b/Documentation/powerpc/vas-api.rst
index 1217c2f1595e..788dc8375a0e 100644
--- a/Documentation/powerpc/vas-api.rst
+++ b/Documentation/powerpc/vas-api.rst
@@ -213,7 +213,7 @@ request buffers are not in memory. The operating system handles the fault by
updating CSB with the following data:
csb.flags = CSB_V;
- csb.cc = CSB_CC_TRANSLATION;
+ csb.cc = CSB_CC_FAULT_ADDRESS;
csb.ce = CSB_CE_TERMINATION;
csb.address = fault_address;