On Thu, Feb 15, 2018 at 10:03:08PM +0100, Christoffer Dall wrote: > The VHE switch function calls __timer_enable_traps and > __timer_disable_traps which don't do anything on VHE systems. > Therefore, simply remove these calls from the VHE switch function and > make the functions non-conditional as they are now only called from the > non-VHE switch path. > > Acked-by: Marc Zyngier <marc.zyngier@xxxxxxx> > Signed-off-by: Christoffer Dall <christoffer.dall@xxxxxxxxxx> > --- > > Notes: > Changes since v2: > - Added comment explaining the timer enable/disable functions > are for !VHE only. > > arch/arm64/kvm/hyp/switch.c | 2 -- > virt/kvm/arm/hyp/timer-sr.c | 44 ++++++++++++++++++++++---------------------- > 2 files changed, 22 insertions(+), 24 deletions(-) > Reviewed-by: Andrew Jones <drjones@xxxxxxxxxx>