Changeset 46c20c8 in mainline for kernel/arch/sparc64/src/trap/sun4u/trap_table.S

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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/trap/sun4u/trap_table.S (moved) (moved from kernel/arch/sparc64/src/trap/trap_table.S ) (2 diffs)

kernel/arch/sparc64/src/trap/sun4u/trap_table.S

@@ -481 +481 @@
         be %xcc, 1f
         nop
-0:      ba %xcc, 0b                             ! this is for debugging, if we ever get here
-        nop                                     ! it will be easy to find
+        ! this is for debugging, if we ever get here it will be easy to find
+0:      ba,a %xcc, 0b
 
 1:
@@ -546 +546 @@
 
 .if NOT(\is_syscall)
-        ba %xcc, 1f
-        nop
+        ba,a %xcc, 1f
 0:
         save %sp, -PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE, %sp