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

Commit b18262ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
  kgdb: don't needlessly skip PAGE_USER test for Fsl booke
parents e97e7120 56151e75

arch/powerpc/mm/fsl_booke_mmu.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -155,15 +155,10 @@ static void settlbcam(int index, unsigned long virt, phys_addr_t phys, 
	if (mmu_has_feature(MMU_FTR_BIG_PHYS))

	if (mmu_has_feature(MMU_FTR_BIG_PHYS))

		TLBCAM[index].MAS7 = (u64)phys >> 32;

		TLBCAM[index].MAS7 = (u64)phys >> 32;





#ifndef CONFIG_KGDB /* want user access for breakpoints */

	if (flags & _PAGE_USER) {

	if (flags & _PAGE_USER) {

	   TLBCAM[index].MAS3 |= MAS3_UX | MAS3_UR;

	   TLBCAM[index].MAS3 |= MAS3_UX | MAS3_UR;

	   TLBCAM[index].MAS3 |= ((flags & _PAGE_RW) ? MAS3_UW : 0);

	   TLBCAM[index].MAS3 |= ((flags & _PAGE_RW) ? MAS3_UW : 0);

	}

	}

#else

	TLBCAM[index].MAS3 |= MAS3_UX | MAS3_UR;

	TLBCAM[index].MAS3 |= ((flags & _PAGE_RW) ? MAS3_UW : 0);

#endif





	tlbcam_addrs[index].start = virt;

	tlbcam_addrs[index].start = virt;

	tlbcam_addrs[index].limit = virt + size - 1;

	tlbcam_addrs[index].limit = virt + size - 1;