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

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

diff --cc arch/powerpc/mm/fsl_booke_mmu.c
index 3260fdfb95f201a2a1c849a4d5b28f27edd6949b,1ce9dd51a2f69c61a717bf4bbb98952244ab17fd..1ed6b52f30319b8ffb717d80d803b143ef6084e7
--- 1/arch/powerpc/mm/fsl_booke_mmu.c
--- 2/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);