Changeset aa85487 in mainline for kernel/arch/sparc64/include/trap/sun4v/mmu.h

Timestamp:

2010-03-07T15:11:56Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

File:

• kernel/arch/sparc64/include/trap/sun4v/mmu.h (modified) (2 diffs)

kernel/arch/sparc64/include/trap/sun4v/mmu.h

@@ -36 +36 @@
  */
 
-#ifndef KERN_sparc64_SUN4V_MMU_TRAP_H_
-#define KERN_sparc64_SUN4V_MMU_TRAP_H_
+#ifndef KERN_sparc64_sun4v_MMU_TRAP_H_
+#define KERN_sparc64_sun4v_MMU_TRAP_H_
 
 #include <arch/stack.h>
@@ -121 +121 @@
          * but this time its handler accesse memory which IS mapped.
          */
-0:
-.if (\tl > 0)
-        wrpr %g0, 1, %tl
-.endif
+        .if (\tl > 0)
+                wrpr %g0, 1, %tl
+        .endif
 
         /*