Changeset 86ffa27f in mainline for kernel/arch/mips32/src/mm/tlb.c

Timestamp:

2011-08-07T11:21:44Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cc574511

Parents:

15f3c3f (diff), e8067c0 (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/src/mm/tlb.c (modified) (2 diffs)

kernel/arch/mips32/src/mm/tlb.c

@@ -73 +73 @@
                 tlbwi();
         }
-                
+        
         /*
          * The kernel is going to make use of some wired
@@ -386 +386 @@
                         ASSERT(pte->w || access != PF_ACCESS_WRITE);
                         return pte;
-                        break;
                 case AS_PF_DEFER:
                         *pfrc = AS_PF_DEFER;
                         return NULL;
-                        break;
                 case AS_PF_FAULT:
                         *pfrc = AS_PF_FAULT;
                         return NULL;
-                        break;
                 default:
                         panic("Unexpected rc (%d).", rc);