diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-09-08 06:41:40 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-09-08 06:41:40 +0200 |
| commit | ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf (patch) | |
| tree | 3a54614d597b7b92ada36c5ea26dc994216b628b /arch/arm64/kernel/cpuinfo.c | |
| parent | Merge tag 'drm-intel-next-2020-08-24-1' of git://anongit.freedesktop.org/drm/... (diff) | |
| parent | Linux 5.9-rc4 (diff) | |
| download | linux-ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf.tar.xz linux-ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf.zip | |
Merge tag 'v5.9-rc4' into drm-next
Backmerge 5.9-rc4 as there is a nasty qxl conflict
that needs to be resolved.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'arch/arm64/kernel/cpuinfo.c')
| -rw-r--r-- | arch/arm64/kernel/cpuinfo.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c index 393c6fb1f1cb..d0076c2159e6 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -327,7 +327,6 @@ static void cpuinfo_detect_icache_policy(struct cpuinfo_arm64 *info) set_bit(ICACHEF_VPIPT, &__icache_flags); break; default: - /* Fallthrough */ case ICACHE_POLICY_VIPT: /* Assume aliasing */ set_bit(ICACHEF_ALIASING, &__icache_flags); |