From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Apr 2010 03:01:42 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel... 
X-Git-Tag: v5.15~29731
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b18262eda36e1f340e3c29a8da9a36b3452621f9;p=mirror_ubuntu-kernels.git

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
---

b18262eda36e1f340e3c29a8da9a36b3452621f9
diff --cc arch/powerpc/mm/fsl_booke_mmu.c
index 3260fdfb95f2,1ce9dd51a2f6..1ed6b52f3031
--- a/arch/powerpc/mm/fsl_booke_mmu.c
+++ b/arch/powerpc/mm/fsl_booke_mmu.c
@@@ -152,10 -152,9 +152,9 @@@ static void settlbcam(int index, unsign
  
  	TLBCAM[index].MAS3 = (phys & MAS3_RPN) | MAS3_SX | MAS3_SR;
  	TLBCAM[index].MAS3 |= ((flags & _PAGE_RW) ? MAS3_SW : 0);
 -	if (cur_cpu_spec->cpu_features & MMU_FTR_BIG_PHYS)
 +	if (mmu_has_feature(MMU_FTR_BIG_PHYS))
  		TLBCAM[index].MAS7 = (u64)phys >> 32;
  
- #ifndef CONFIG_KGDB /* want user access for breakpoints */
  	if (flags & _PAGE_USER) {
  	   TLBCAM[index].MAS3 |= MAS3_UX | MAS3_UR;
  	   TLBCAM[index].MAS3 |= ((flags & _PAGE_RW) ? MAS3_UW : 0);