diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-05-27 13:10:21 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-05-27 13:10:21 -0400 |
| commit | 4c7ccc3bf746c625cfb352a1d6082f6460cbbce0 (patch) | |
| tree | 6280f9123bb3886a4cfd07e3d50183cae6c12b4d /arch/s390/mm | |
| parent | 9d5272f5e36155bcead69417fd12e98624e7faef (diff) | |
| parent | 0b545fd17f84184f9536bde68c3521e36c488448 (diff) | |
| download | linux-4c7ccc3bf746c625cfb352a1d6082f6460cbbce0.tar.gz linux-4c7ccc3bf746c625cfb352a1d6082f6460cbbce0.tar.bz2 linux-4c7ccc3bf746c625cfb352a1d6082f6460cbbce0.zip | |
Merge tag 'kvm-s390-next-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: Cleanups for 5.8
- vsie (nesting) cleanups
- remove unneeded semicolon
Diffstat (limited to 'arch/s390/mm')
| -rw-r--r-- | arch/s390/mm/gmap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c index 1a95d8809cc3..4b6903fbba4a 100644 --- a/arch/s390/mm/gmap.c +++ b/arch/s390/mm/gmap.c @@ -788,19 +788,19 @@ static inline unsigned long *gmap_table_walk(struct gmap *gmap, unsigned long gaddr, int level) { const int asce_type = gmap->asce & _ASCE_TYPE_MASK; - unsigned long *table; + unsigned long *table = gmap->table; - if ((gmap->asce & _ASCE_TYPE_MASK) + 4 < (level * 4)) - return NULL; if (gmap_is_shadow(gmap) && gmap->removed) return NULL; + if (WARN_ON_ONCE(level > (asce_type >> 2) + 1)) + return NULL; + if (asce_type != _ASCE_TYPE_REGION1 && gaddr & (-1UL << (31 + (asce_type >> 2) * 11))) return NULL; - table = gmap->table; - switch (gmap->asce & _ASCE_TYPE_MASK) { + switch (asce_type) { case _ASCE_TYPE_REGION1: table += (gaddr & _REGION1_INDEX) >> _REGION1_SHIFT; if (level == 4) |