diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-29 20:01:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-29 20:01:42 -0700 |
| commit | b18262eda36e1f340e3c29a8da9a36b3452621f9 (patch) | |
| tree | 9ec97b524d41ba1a84ff013296b63f2db057be0d /arch | |
| parent | e97e7120eb24800cf8eb62c7da07b161cc2a8c73 (diff) | |
| parent | 56151e753468e34aeb322af4b0309ab727c97d2e (diff) | |
| download | linux-3.10-b18262eda36e1f340e3c29a8da9a36b3452621f9.tar.gz linux-3.10-b18262eda36e1f340e3c29a8da9a36b3452621f9.tar.bz2 linux-3.10-b18262eda36e1f340e3c29a8da9a36b3452621f9.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/mm/fsl_booke_mmu.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c index 3260fdfb95f..1ed6b52f303 100644 --- a/arch/powerpc/mm/fsl_booke_mmu.c +++ b/arch/powerpc/mm/fsl_booke_mmu.c @@ -155,15 +155,10 @@ static void settlbcam(int index, unsigned long virt, phys_addr_t 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); } -#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].limit = virt + size - 1; |