Changeset e1a27be in mainline for kernel/arch/mips32/include/mm/tlb.h


Ignore:
Timestamp:
2012-12-29T10:48:35Z (12 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
17cc8f4f
Parents:
8f88beb (diff), c928bb7 (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 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/mips32/include/mm/tlb.h

    r8f88beb re1a27be  
    112112#ifdef __BE__
    113113                unsigned p : 1;
    114                 unsigned : 27;
    115                 unsigned index : 4;
     114                unsigned : 25;
     115                unsigned index : 6;
    116116#else
    117                 unsigned index : 4;
    118                 unsigned : 27;
     117                unsigned index : 6;
     118                unsigned : 25;
    119119                unsigned p : 1;
    120120#endif
Note: See TracChangeset for help on using the changeset viewer.