diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-06-21 10:07:52 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-06-21 10:07:52 +0300 |
| commit | f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9 (patch) | |
| tree | 84d3297b16fa7e373f2eabef56cd12ae5a9b8a29 /virt/kvm/arm/hyp/vgic-v3-sr.c | |
| parent | 098b0e01a91c42aaaf0425605cd126b03fcb0bcf (diff) | |
| parent | 8e6cec1c7c5afa489687c90be15d6ed82c742975 (diff) | |
| download | linux-f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9.tar.xz | |
Merge branch 'timers/urgent' into timers/core
Pick up dependent changes.
Diffstat (limited to 'virt/kvm/arm/hyp/vgic-v3-sr.c')
| -rw-r--r-- | virt/kvm/arm/hyp/vgic-v3-sr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/arm/hyp/vgic-v3-sr.c b/virt/kvm/arm/hyp/vgic-v3-sr.c index 32c3295929b0..87940364570b 100644 --- a/virt/kvm/arm/hyp/vgic-v3-sr.c +++ b/virt/kvm/arm/hyp/vgic-v3-sr.c @@ -22,7 +22,7 @@ #include <asm/kvm_hyp.h> #define vtr_to_max_lr_idx(v) ((v) & 0xf) -#define vtr_to_nr_pre_bits(v) (((u32)(v) >> 26) + 1) +#define vtr_to_nr_pre_bits(v) ((((u32)(v) >> 26) & 7) + 1) static u64 __hyp_text __gic_v3_get_lr(unsigned int lr) { |