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

Timestamp:

2013-03-10T14:56:21Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

05bab88

Parents:

ea906c29 (diff), 2277e03 (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:

• kernel/arch/mips32/include/arch/mm/tlb.h (modified) (1 diff)

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

@@ -112 +112 @@
 #ifdef __BE__
                 unsigned p : 1;
-                unsigned : 27;
-                unsigned index : 4;
+                unsigned : 25;
+                unsigned index : 6;
 #else
-                unsigned index : 4;
-                unsigned : 27;
+                unsigned index : 6;
+                unsigned : 25;
                 unsigned p : 1;
 #endif