diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-11-15 23:13:40 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-11-15 23:13:40 +0100 |
| commit | 06f43286c6354aaab0103615e83893512f86eee7 (patch) | |
| tree | c0c6bc4819fa381a9e1a2a051492eb4813bd410b /cpu/mpc85xx/tlb.c | |
| parent | c758e947aa7d39a2be607ecdedd818ad300807b2 (diff) | |
| parent | 3c014f1586d5bfe30dca7549396915c83f31cd30 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'cpu/mpc85xx/tlb.c')
| -rw-r--r-- | cpu/mpc85xx/tlb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc85xx/tlb.c b/cpu/mpc85xx/tlb.c index 6e94c237a..ea5deb297 100644 --- a/cpu/mpc85xx/tlb.c +++ b/cpu/mpc85xx/tlb.c @@ -132,10 +132,10 @@ int find_tlb_idx(void *addr, u8 tlbsel) void init_addr_map(void) { int i; - unsigned int max_cam = (mfspr(SPRN_TLB1CFG) >> 16) & 0xff; + unsigned int num_cam = mfspr(SPRN_TLB1CFG) & 0xfff; /* walk all the entries */ - for (i = 0; i < max_cam; i++) { + for (i = 0; i < num_cam; i++) { unsigned long epn; u32 tsize, _mas1; phys_addr_t rpn; |