Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9da4e380 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Christian Borntraeger
Browse files

KVM: s390/mm: readd address parameter to gmap_do_ipte_notify 



Revert git commit c3a23b9874c1 ("remove unnecessary parameter from
gmap_do_ipte_notify").

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 55dbbdd9

arch/s390/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ bool gmap_test_and_clear_dirty(unsigned long address, struct gmap *); 
void gmap_register_ipte_notifier(struct gmap_notifier *);

void gmap_unregister_ipte_notifier(struct gmap_notifier *);

int gmap_ipte_notify(struct gmap *, unsigned long start, unsigned long len);

void gmap_do_ipte_notify(struct mm_struct *, pte_t *);

void gmap_do_ipte_notify(struct mm_struct *, unsigned long addr, pte_t *);



static inline pgste_t pgste_ipte_notify(struct mm_struct *mm,

					unsigned long addr,
@@ -865,7 +865,7 @@ static inline pgste_t pgste_ipte_notify(struct mm_struct *mm, 
#ifdef CONFIG_PGSTE

	if (pgste_val(pgste) & PGSTE_IN_BIT) {

		pgste_val(pgste) &= ~PGSTE_IN_BIT;

		gmap_do_ipte_notify(mm, ptep);

		gmap_do_ipte_notify(mm, addr, ptep);

	}

#endif

	return pgste;

arch/s390/mm/pgtable.c

+2 −1
Original line number Diff line number Diff line
@@ -809,12 +809,13 @@ EXPORT_SYMBOL_GPL(gmap_ipte_notify); 
/**

 * gmap_do_ipte_notify - call all invalidation callbacks for a specific pte.

 * @mm: pointer to the process mm_struct

 * @addr: virtual address in the process address space

 * @pte: pointer to the page table entry

 *

 * This function is assumed to be called with the page table lock held

 * for the pte to notify.

 */

void gmap_do_ipte_notify(struct mm_struct *mm, pte_t *pte)

void gmap_do_ipte_notify(struct mm_struct *mm, unsigned long addr, pte_t *pte)

{

	unsigned long segment_offset;

	struct gmap_notifier *nb;