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 /tools/testing/selftests/powerpc/nx-gzip/gunz_test.c | |
| 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.gz 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 'tools/testing/selftests/powerpc/nx-gzip/gunz_test.c')
| -rw-r--r-- | tools/testing/selftests/powerpc/nx-gzip/gunz_test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/selftests/powerpc/nx-gzip/gunz_test.c b/tools/testing/selftests/powerpc/nx-gzip/gunz_test.c index 6ee0fded0391..7c23d3dd7d6d 100644 --- a/tools/testing/selftests/powerpc/nx-gzip/gunz_test.c +++ b/tools/testing/selftests/powerpc/nx-gzip/gunz_test.c @@ -698,13 +698,13 @@ restart_nx: switch (cc) { - case ERR_NX_TRANSLATION: + case ERR_NX_AT_FAULT: /* We touched the pages ahead of time. In the most common case * we shouldn't be here. But may be some pages were paged out. * Kernel should have placed the faulting address to fsaddr. */ - NXPRT(fprintf(stderr, "ERR_NX_TRANSLATION %p\n", + NXPRT(fprintf(stderr, "ERR_NX_AT_FAULT %p\n", (void *)cmdp->crb.csb.fsaddr)); if (pgfault_retries == NX_MAX_FAULTS) { |