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

Commit 52bef0cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents dc8a64ee 71528d8b

arch/powerpc/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

arch/powerpc/kernel/process.c

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

arch/powerpc/mm/hugetlbpage.c

+2 −2
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ 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),