Skip to content

Commit aa0ae3d

Browse files
committed
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.
2 parents c8a11a9 + 27072b8 commit aa0ae3d

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

arch/s390/kvm/vsie.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -587,10 +587,6 @@ void kvm_s390_vsie_gmap_notifier(struct gmap *gmap, unsigned long start,
587587

588588
if (!gmap_is_shadow(gmap))
589589
return;
590-
if (start >= 1UL << 31)
591-
/* We are only interested in prefix pages */
592-
return;
593-
594590
/*
595591
* Only new shadow blocks are added to the list during runtime,
596592
* therefore we can safely reference them all the time.

arch/s390/mm/pgtable.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ void ptep_zap_unused(struct mm_struct *mm, unsigned long addr,
756756
pte_clear(mm, addr, ptep);
757757
}
758758
if (reset)
759-
pgste_val(pgste) &= ~_PGSTE_GPS_USAGE_MASK;
759+
pgste_val(pgste) &= ~(_PGSTE_GPS_USAGE_MASK | _PGSTE_GPS_NODAT);
760760
pgste_set_unlock(ptep, pgste);
761761
preempt_enable();
762762
}

0 commit comments

Comments
 (0)