Ignore:
Timestamp:
2013-04-29T11:29:45Z (12 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
aa2b32c
Parents:
ba4799a (diff), df956b9b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

File:
1 moved

Legend:

Unmodified
Added
Removed
  • kernel/arch/mips32/include/arch/mm/tlb.h

    rba4799a r06b0211b  
    4141#include <trace.h>
    4242
     43#if defined(PROCESSOR_R4000)
    4344#define TLB_ENTRY_COUNT  48
     45#define TLB_INDEX_BITS   6
     46#elif defined(PROCESSOR_4Kc)
     47#define TLB_ENTRY_COUNT  16
     48#define TLB_INDEX_BITS   4
     49#else
     50#error Please define TLB_ENTRY_COUNT for the target processor.
     51#endif
    4452
    45 #define TLB_WIRED               1
    46 #define TLB_KSTACK_WIRED_INDEX  0
     53#define TLB_WIRED               0
    4754
    4855#define TLB_PAGE_MASK_4K    (0x000 << 13)
     
    112119#ifdef __BE__
    113120                unsigned p : 1;
    114                 unsigned : 25;
    115                 unsigned index : 6;
     121                unsigned : 32 - TLB_INDEX_BITS - 1;
     122                unsigned index : TLB_INDEX_BITS;
    116123#else
    117                 unsigned index : 6;
    118                 unsigned : 25;
     124                unsigned index : TLB_INDEX_BITS;
     125                unsigned : 32 - TLB_INDEX_BITS - 1;
    119126                unsigned p : 1;
    120127#endif
Note: See TracChangeset for help on using the changeset viewer.