Hi Heiko, On Wed, 21 Aug 2013 17:12:33 +0200 Heiko Carstens <heiko.carstens@xxxxxxxxxx> wrote: > > could you please add the compile fix below to linux-next? I will add it to the kvm tree merge from today. cc'd the kvm tree maintainers as one they will need to tell Linus about this semantic conflict when they ask him to pull their tree. [Patch recreated below for reference] From: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Date: Wed, 21 Aug 2013 16:46:25 +0200 Subject: [PATCH] s390: fix tlb_gather_mmu fallout With commit 2b047252 "Fix TLB gather virtual address range invalidation corner cases" tlb_gather_mmu() got a new argument. There is however a patch in the kvm/linux-next tree "KVM: s390: allow sie enablement for multi-threaded programs" which now causes breakage in linux-next: arch/s390/mm/pgtable.c: In function ‘s390_enable_sie’: arch/s390/mm/pgtable.c:1175:2: error: too few arguments to function ‘tlb_gather_mmu’ So let's fix just this. Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx> --- arch/s390/mm/pgtable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c index ef34519..8a123da 100644 --- a/arch/s390/mm/pgtable.c +++ b/arch/s390/mm/pgtable.c @@ -1172,7 +1172,7 @@ int s390_enable_sie(void) thp_split_mm(mm); /* Reallocate the page tables with pgstes */ mm->context.has_pgste = 1; - tlb_gather_mmu(&tlb, mm, 0); + tlb_gather_mmu(&tlb, mm, 0, TASK_SIZE); page_table_realloc(&tlb, mm, 0, TASK_SIZE); tlb_finish_mmu(&tlb, 0, -1); up_write(&mm->mmap_sem); -- 1.8.2.3 -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgplfDRiHXQvr.pgp
Description: PGP signature
