Changeset aa85487 in mainline for kernel/arch/sparc64/include/trap/regwin.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/regwin.h (modified) (2 diffs)

kernel/arch/sparc64/include/trap/regwin.h

@@ -183 +183 @@
         add %l0, 1, %l0
         wrpr %l0, 0, %cleanwin
+#if defined(SUN4U)
         mov %r0, %l0
         mov %r0, %l1
@@ -199 +200 @@
         mov %r0, %o6
         mov %r0, %o7
+#endif
         retry
 .endm
 #endif /* __ASM__ */
 
-#if defined (SUN4U)
+#if defined(SUN4U)
 #include <arch/trap/sun4u/regwin.h>
-#elif defined (SUN4V)
+#elif defined(SUN4V)
 #include <arch/trap/sun4v/regwin.h>
 #endif