diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2020-07-18 14:43:55 +0200 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-07-18 14:43:55 +0200 |
commit | ef9f7cfaa50025068c69cdee8efccee12d9fabfc (patch) | |
tree | afe8211215c04bd85763e1e37b079c9ef0f0355e /Documentation/powerpc | |
parent | powerpc/pseries: Detect secure and trusted boot state of the system. (diff) | |
parent | selftests/powerpc: Use proper error code to check fault address (diff) | |
download | linux-ef9f7cfaa50025068c69cdee8efccee12d9fabfc.tar.xz linux-ef9f7cfaa50025068c69cdee8efccee12d9fabfc.zip |
Merge branch 'fixes' into next
Merge our fixes branch, primarily to bring in the ebb selftests build
fix and the pkey fix, which is a dependency for some future work.
Diffstat (limited to 'Documentation/powerpc')
-rw-r--r-- | Documentation/powerpc/vas-api.rst | 2 |
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; |