Changeset 721d4e85 in mainline for kernel/arch/sparc64/include/trap/trap_table.h

Timestamp:

2010-02-20T22:23:42Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

61001a9, af56e9b

Parents:

aa30c7f (diff), c2efbb4 (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 from lp:~rimskyp/helenos/sparc.

File:

• kernel/arch/sparc64/include/trap/trap_table.h (modified) (1 diff)

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

@@ -101 +101 @@
 .macro PREEMPTIBLE_HANDLER f
         sethi %hi(\f), %g1
-        ba %xcc, preemptible_handler
+        b preemptible_handler
         or %g1, %lo(\f), %g1
 .endm