OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[uclinux-h8/linux.git]
/
arch
/
powerpc
/
mm
/
fsl_booke_mmu.c
diff --git
a/arch/powerpc/mm/fsl_booke_mmu.c
b/arch/powerpc/mm/fsl_booke_mmu.c
index
f3afe3d
..
a1b2713
100644
(file)
--- a/
arch/powerpc/mm/fsl_booke_mmu.c
+++ b/
arch/powerpc/mm/fsl_booke_mmu.c
@@
-72,10
+72,11
@@
unsigned long tlbcam_sz(int idx)
return tlbcam_addrs[idx].limit - tlbcam_addrs[idx].start + 1;
}
return tlbcam_addrs[idx].limit - tlbcam_addrs[idx].start + 1;
}
+#ifdef CONFIG_FSL_BOOKE
/*
* Return PA for this VA if it is mapped by a CAM, or 0
*/
/*
* Return PA for this VA if it is mapped by a CAM, or 0
*/
-phys_addr_t v_
mapped_by_tlbcam
(unsigned long va)
+phys_addr_t v_
block_mapped
(unsigned long va)
{
int b;
for (b = 0; b < tlbcam_index; ++b)
{
int b;
for (b = 0; b < tlbcam_index; ++b)
@@
-87,7
+88,7
@@
phys_addr_t v_mapped_by_tlbcam(unsigned long va)
/*
* Return VA for a given PA or 0 if not mapped
*/
/*
* Return VA for a given PA or 0 if not mapped
*/
-unsigned long p_
mapped_by_tlbcam
(phys_addr_t pa)
+unsigned long p_
block_mapped
(phys_addr_t pa)
{
int b;
for (b = 0; b < tlbcam_index; ++b)
{
int b;
for (b = 0; b < tlbcam_index; ++b)
@@
-97,6
+98,7
@@
unsigned long p_mapped_by_tlbcam(phys_addr_t pa)
return tlbcam_addrs[b].start+(pa-tlbcam_addrs[b].phys);
return 0;
}
return tlbcam_addrs[b].start+(pa-tlbcam_addrs[b].phys);
return 0;
}
+#endif
/*
* Set up a variable-size TLB entry (tlbcam). The parameters are not checked;
/*
* Set up a variable-size TLB entry (tlbcam). The parameters are not checked;