Merge tag 'powerpc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

torvalds · torvalds · commit 52bef0cb107d · 2016-04-01T07:18:27.000-05:00
Pull powerpc fixes from Michael Ellerman:
 - Fixup preempt underflow with huge pages from Sebastian Siewior
 - Fix altivec SPR not being saved from Oliver O'Halloran
 - Correct used_vsr comment from Simon Guo

* tag 'powerpc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc: Correct used_vsr comment
  powerpc/process: Fix altivec SPR not being saved
  powerpc/mm: Fixup preempt underflow with huge pages
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
@@ -246,7 +246,7 @@ struct thread_struct {
 #endif /* CONFIG_ALTIVEC */
 #ifdef CONFIG_VSX
 	/* VSR status */
-	int		used_vsr;	/* set if process has used altivec */
+	int		used_vsr;	/* set if process has used VSX */
 #endif /* CONFIG_VSX */
 #ifdef CONFIG_SPE
 	unsigned long	evr[32];	/* upper 32-bits of SPE regs */
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
@@ -983,7 +983,7 @@ void restore_tm_state(struct pt_regs *regs)
 static inline void save_sprs(struct thread_struct *t)
 {
 #ifdef CONFIG_ALTIVEC
-	if (cpu_has_feature(cpu_has_feature(CPU_FTR_ALTIVEC)))
+	if (cpu_has_feature(CPU_FTR_ALTIVEC))
 		t->vrsave = mfspr(SPRN_VRSAVE);
 #endif
 #ifdef CONFIG_PPC_BOOK3S_64
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
@@ -413,13 +413,13 @@ static void hugepd_free(struct mmu_gather *tlb, void *hugepte)
 {
 	struct hugepd_freelist **batchp;
 
-	batchp = this_cpu_ptr(&hugepd_freelist_cur);
+	batchp = &get_cpu_var(hugepd_freelist_cur);
 
 	if (atomic_read(&tlb->mm->mm_users) < 2 ||
 	    cpumask_equal(mm_cpumask(tlb->mm),
 			  cpumask_of(smp_processor_id()))) {
 		kmem_cache_free(hugepte_cache, hugepte);
-        put_cpu_var(hugepd_freelist_cur);
+		put_cpu_var(hugepd_freelist_cur);
 		return;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -983,7 +983,7 @@ void restore_tm_state(struct pt_regs *regs)`
`983`	`983`	`static inline void save_sprs(struct thread_struct *t)`
`984`	`984`	`{`
`985`	`985`	`#ifdef CONFIG_ALTIVEC`
`986`		`- if (cpu_has_feature(cpu_has_feature(CPU_FTR_ALTIVEC)))`
	`986`	`+ if (cpu_has_feature(CPU_FTR_ALTIVEC))`
`987`	`987`	`t->vrsave = mfspr(SPRN_VRSAVE);`
`988`	`988`	`#endif`
`989`	`989`	`#ifdef CONFIG_PPC_BOOK3S_64`
Original file line number	Diff line number	Diff line change
`@@ -413,13 +413,13 @@ static void hugepd_free(struct mmu_gather tlb, void hugepte)`
`413`	`413`	`{`
`414`	`414`	`struct hugepd_freelist **batchp;`
`415`	`415`
`416`		`- batchp = this_cpu_ptr(&hugepd_freelist_cur);`
	`416`	`+ batchp = &get_cpu_var(hugepd_freelist_cur);`
`417`	`417`
`418`	`418`	`if (atomic_read(&tlb->mm->mm_users) < 2 \|\|`
`419`	`419`	`cpumask_equal(mm_cpumask(tlb->mm),`
`420`	`420`	`cpumask_of(smp_processor_id()))) {`
`421`	`421`	`kmem_cache_free(hugepte_cache, hugepte);`
`422`		`- put_cpu_var(hugepd_freelist_cur);`
	`422`	`+ put_cpu_var(hugepd_freelist_cur);`
`423`	`423`	`return;`
`424`	`424`	`}`
`425`	`425`