diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-05-25 16:10:37 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-05-25 16:10:37 +0300 |
| commit | a5d8e55b2c7d3d18d7837af0ef8d1477eeeb919c (patch) | |
| tree | fe07d3af2f6f13d005da832fe3d18d5d257fb9bd /arch/csky/abiv1/inc/abi | |
| parent | 4da0b2b7e67524cc206067865666899bc02e1cb0 (diff) | |
| parent | 9cb1fd0efd195590b828b9b865421ad345a4a145 (diff) | |
| download | linux-a5d8e55b2c7d3d18d7837af0ef8d1477eeeb919c.tar.xz | |
Merge tag 'v5.7-rc7' into efi/core, to refresh the branch and pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/csky/abiv1/inc/abi')
| -rw-r--r-- | arch/csky/abiv1/inc/abi/entry.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/csky/abiv1/inc/abi/entry.h b/arch/csky/abiv1/inc/abi/entry.h index 5056ebb902d1..61d94ec7dd16 100644 --- a/arch/csky/abiv1/inc/abi/entry.h +++ b/arch/csky/abiv1/inc/abi/entry.h @@ -167,8 +167,8 @@ * BA Reserved C D V */ cprcr r6, cpcr30 - lsri r6, 28 - lsli r6, 28 + lsri r6, 29 + lsli r6, 29 addi r6, 0xe cpwcr r6, cpcr30 |