diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2020-07-18 22:43:55 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-07-18 22:43:55 +1000 |
| commit | ef9f7cfaa50025068c69cdee8efccee12d9fabfc (patch) | |
| tree | afe8211215c04bd85763e1e37b079c9ef0f0355e /arch/powerpc/platforms | |
| parent | 61f879d97ce4510dd29d676a20d67692e3b34806 (diff) | |
| parent | f0479c4bcbd92d1a457d4a43bcab79f29d11334a (diff) | |
| download | linux-ef9f7cfaa50025068c69cdee8efccee12d9fabfc.tar.bz2 | |
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 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/powernv/vas-fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powernv/vas-fault.c b/arch/powerpc/platforms/powernv/vas-fault.c index 266a6ca5e15e..3d21fce254b7 100644 --- a/arch/powerpc/platforms/powernv/vas-fault.c +++ b/arch/powerpc/platforms/powernv/vas-fault.c @@ -79,7 +79,7 @@ static void update_csb(struct vas_window *window, csb_addr = (void __user *)be64_to_cpu(crb->csb_addr); memset(&csb, 0, sizeof(csb)); - csb.cc = CSB_CC_TRANSLATION; + csb.cc = CSB_CC_FAULT_ADDRESS; csb.ce = CSB_CE_TERMINATION; csb.cs = 0; csb.count = 0; |