Changeset 7715994 in mainline for kernel/arch/sparc64/src/mm/sun4v/tlb.c

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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/sparc64/src/mm/sun4v/tlb.c (modified) (3 diffs)

kernel/arch/sparc64/src/mm/sun4v/tlb.c

@@ -89 +89 @@
  * field of the MMU fault status area is i.
  */
-char *fault_types[] = {
+static const char *fault_types[] = {
         "unknown",
         "fast miss",
@@ -107 +107 @@
         "invalid page size"
         };
-        
 
 /** Array of MMU fault status areas. */
@@ -406 +405 @@
         uint64_t errno =  __hypercall_fast3(MMU_DEMAP_ALL, 0, 0,
                 MMU_FLAG_DTLB | MMU_FLAG_ITLB);
-        if (errno != EOK) {
+        if (errno != HV_EOK) {
                 panic("Error code = %d.\n", errno);
         }