diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-12-08 13:13:12 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-12-08 13:13:12 -0500 |
| commit | aa0ae3df809909b5f06bd46a825dd923538e0115 (patch) | |
| tree | 228bf1fb045ece5d21c1937faa67632b0823c61f | |
| parent | c8a11a938c9def4e976b3c6f92f01c9b8655ff78 (diff) | |
| parent | 27072b8e18a73ffeffb1c140939023915a35134b (diff) | |
| download | linux-aa0ae3df809909b5f06bd46a825dd923538e0115.tar.gz | |
Merge tag 'kvm-s390-master-6.7-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master
Two small but important bugfixes.
| -rw-r--r-- | arch/s390/kvm/vsie.c | 4 | ||||
| -rw-r--r-- | arch/s390/mm/pgtable.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index 02dcbe82a8e512..8207a892bbe22f 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -587,10 +587,6 @@ void kvm_s390_vsie_gmap_notifier(struct gmap *gmap, unsigned long start, if (!gmap_is_shadow(gmap)) return; - if (start >= 1UL << 31) - /* We are only interested in prefix pages */ - return; - /* * Only new shadow blocks are added to the list during runtime, * therefore we can safely reference them all the time. diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c index 3bd2ab2a9a3449..5cb92941540b32 100644 --- a/arch/s390/mm/pgtable.c +++ b/arch/s390/mm/pgtable.c @@ -756,7 +756,7 @@ void ptep_zap_unused(struct mm_struct *mm, unsigned long addr, pte_clear(mm, addr, ptep); } if (reset) - pgste_val(pgste) &= ~_PGSTE_GPS_USAGE_MASK; + pgste_val(pgste) &= ~(_PGSTE_GPS_USAGE_MASK | _PGSTE_GPS_NODAT); pgste_set_unlock(ptep, pgste); preempt_enable(); } |