diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-07-24 00:28:09 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-07-24 00:48:05 +0200 |
| commit | 41206a073ceebc517245677a19f52ba6379b33a9 (patch) | |
| tree | 2fc35aac6abe32b99058ad55b0fc6e4d449d1056 /arch/arc/kernel/head.S | |
| parent | Merge tag 'amd-drm-next-5.9-2020-07-17' of git://people.freedesktop.org/~agd5... (diff) | |
| parent | Linux 5.8-rc6 (diff) | |
| download | linux-41206a073ceebc517245677a19f52ba6379b33a9.tar.xz linux-41206a073ceebc517245677a19f52ba6379b33a9.zip | |
Merge v5.8-rc6 into drm-next
I've got a silent conflict + two trees based on fixes to merge.
Fixes a silent merge with amdgpu
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'arch/arc/kernel/head.S')
| -rw-r--r-- | arch/arc/kernel/head.S | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arc/kernel/head.S b/arch/arc/kernel/head.S index 6eb23f1545ee..17fd1ed700cc 100644 --- a/arch/arc/kernel/head.S +++ b/arch/arc/kernel/head.S @@ -59,6 +59,14 @@ bclr r5, r5, STATUS_AD_BIT #endif kflag r5 + +#ifdef CONFIG_ARC_LPB_DISABLE + lr r5, [ARC_REG_LPB_BUILD] + breq r5, 0, 1f ; LPB doesn't exist + mov r5, 1 + sr r5, [ARC_REG_LPB_CTRL] +1: +#endif /* CONFIG_ARC_LPB_DISABLE */ #endif ; Config DSP_CTRL properly, so kernel may use integer multiply, ; multiply-accumulate, and divide operations |