KVM: arm64: Fix nVHE boot on VHE systems

Browse source

Conflict resolution gone astray results in the kernel not booting
on VHE-capable HW when VHE support is disabled. Thankfully spotted
by David.

Reported-by: David Brazdil <dbrazdil@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>

...

This commit is contained in:

Marc Zyngier 2020-12-08 19:51:49 +00:00

parent f19f6644a5

commit 0cc519f85a

1 changed files with 4 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

arch/arm64/kernel/head.S

View file