Commit aa0ae3df authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-master-6.7-1' of... 

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.
parents c8a11a93 27072b8e

arch/s390/kvm/vsie.c

+0 −4
Original line number Diff line number Diff line
@@ -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.

arch/s390/mm/pgtable.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

}