From 72d96d33031e05284cbe82033dd4610218dcc656 Mon Sep 17 00:00:00 2001 From: Becky Bruce Date: Wed, 30 Jun 2010 10:23:31 +0000 Subject: [PATCH] --- yaml --- r: 204695 b: refs/heads/master c: d10ac3734d07bee675384d22d06883b3c57b1524 h: refs/heads/master i: 204693: 86ea0619e1e62d8e4612ecba36e7cbcc5f9d71a9 204691: 82da6fef8bd97a7701ba5eee4d8a9be47ea7c443 204687: 150712a0b744d14082d7806e528af1dad2cf9ffa v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/fsl_booke_mmu.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e799c0a79b40..2b83af3051c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6901c6cca1271d1724fc15e9937e0820e2d2fbd5 +refs/heads/master: d10ac3734d07bee675384d22d06883b3c57b1524 diff --git a/trunk/arch/powerpc/mm/fsl_booke_mmu.c b/trunk/arch/powerpc/mm/fsl_booke_mmu.c index cdc7526e9c93..4b66a1ece6d8 100644 --- a/trunk/arch/powerpc/mm/fsl_booke_mmu.c +++ b/trunk/arch/powerpc/mm/fsl_booke_mmu.c @@ -104,9 +104,10 @@ unsigned long p_mapped_by_tlbcam(phys_addr_t pa) } /* - * Set up one of the I/D BAT (block address translation) register pairs. - * The parameters are not checked; in particular size must be a power - * of 4 between 4k and 256M. + * Set up a variable-size TLB entry (tlbcam). The parameters are not checked; + * in particular size must be a power of 4 between 4k and 256M (or 1G, for cpus + * that support extended page sizes). Note that while some cpus support a + * page size of 4G, we don't allow its use here. */ static void settlbcam(int index, unsigned long virt, phys_addr_t phys, unsigned long size, unsigned long flags, unsigned int pid)