PERFORCE change 140768 for review

[Marcel Moolenaar]

http://perforce.freebsd.org/chv.cgi?CH=140768

Change 140768 by marcel at marcel_xcllnt on 2008/04/27 23:42:45

	Fix merge botch.

Affected files ...

.. //depot/projects/powerpc/sys/powerpc/aim/trap_subr.S#6 edit

Differences ...

==== //depot/projects/powerpc/sys/powerpc/aim/trap_subr.S#6 (text+ko) ====

@@ -230,16 +230,6 @@
 
 #ifdef SMP
 /*
- */
-	.data
-	.align	4
-GLOBAL(dbstk)
-	.space	INTSTK+8			/* kdb stack */
-#endif
-
-	.text
-
-/*
  * Processor reset exception handler. These are typically
  * the first instructions the processor executes after a
  * software reset.
@@ -292,6 +282,7 @@
 9:
 	b	9b
 CNAME(rstsize) = . - CNAME(rstcode)
+#endif
 
 /*
  * This code gets copied to all the trap vectors