Changeset 72bf0d2 in mainline for kernel/arch/sparc64/src/trap/sun4v/trap_table.S

Timestamp:

2010-02-22T21:24:19Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

850987d

Parents:

61001a9 (diff), f8f7dba (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.
Fix non-SMP build on sun4v.
Minor cleanup.

File:

• kernel/arch/sparc64/src/trap/sun4v/trap_table.S (modified) (2 diffs)

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

@@ -344 +344 @@
 .global cpu_mondo_handler_tl0
 cpu_mondo_handler_tl0:
-/* PREEMPTIBLE_HANDLER cpu_mondo */
+PREEMPTIBLE_HANDLER cpu_mondo
 
 /* TT = 0x80, TL = 0, spill_0_normal handler */
@@ -533 +533 @@
 cpu_mondo_handler_tl1:
         wrpr %g0, %tl
-/*      PREEMPTIBLE_HANDLER cpu_mondo */
+        PREEMPTIBLE_HANDLER cpu_mondo
 
 /* TT = 0x80, TL > 0, spill_0_normal handler */