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

Timestamp:

2009-09-21T11:53:03Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4098e38

Parents:

2f636b6 (diff), c1618ed (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/mm/tlb.h (modified) (4 diffs)

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

@@ -59 +59 @@
 typedef union {
         struct {
-#ifdef BIG_ENDIAN
+#ifdef __BE__
                 unsigned : 2;       /* zero */
                 unsigned pfn : 24;  /* frame number */
@@ -80 +80 @@
 typedef union {
         struct {
-#ifdef BIG_ENDIAN
+#ifdef __BE__
                 unsigned vpn2 : 19;
                 unsigned : 5;
@@ -95 +95 @@
 typedef union {
         struct {
-#ifdef BIG_ENDIAN
+#ifdef __BE__
                 unsigned : 7;
                 unsigned mask : 12;
@@ -110 +110 @@
 typedef union {
         struct {
-#ifdef BIG_ENDIAN
+#ifdef __BE__
                 unsigned p : 1;
                 unsigned : 27;