While working on something else, I noticed that there are still some
CONFIG_IA64_EARLY_PRINTK bits left over in head.S, even though that
option is long gone.

While at it, I also added a "hint @pause" in the endless loop at the
end of _start.  Not that it ever should get executed, but if it ever
does, why waste power/cycles?

Signed-off-by: David Mosberger-Tang <[EMAIL PROTECTED]>

===== arch/ia64/kernel/head.S 1.30 vs edited =====
--- 1.30/arch/ia64/kernel/head.S        2005-01-11 15:45:50 -08:00
+++ edited/arch/ia64/kernel/head.S      2005-01-25 13:36:40 -08:00
@@ -5,7 +5,7 @@
  * to set up the kernel's global pointer and jump to the kernel
  * entry point.
  *
- * Copyright (C) 1998-2001, 2003 Hewlett-Packard Co
+ * Copyright (C) 1998-2001, 2003, 2005 Hewlett-Packard Co
  *     David Mosberger-Tang <[EMAIL PROTECTED]>
  *     Stephane Eranian <[EMAIL PROTECTED]>
  * Copyright (C) 1999 VA Linux Systems
@@ -232,21 +232,6 @@
        ;;
 (isBP) st8 [r2]=r28            // save the address of the boot param area 
passed by the bootloader
 
-#ifdef CONFIG_IA64_EARLY_PRINTK
-       .rodata
-alive_msg:
-       stringz "I'm alive and well\n"
-alive_msg_end:
-       .previous
-
-       alloc r2=ar.pfs,0,0,2,0
-       movl out0=alive_msg
-       movl out1=alive_msg_end-alive_msg-1
-       ;;
-       br.call.sptk.many rp=early_printk
-1:     // force new bundle
-#endif /* CONFIG_IA64_EARLY_PRINTK */
-
 #ifdef CONFIG_SMP
 (isAP) br.call.sptk.many rp=start_secondary
 .ret0:
@@ -267,7 +252,9 @@
        ;;
        ld8 out0=[r3]
        br.call.sptk.many b0=console_print
-self:  br.sptk.many self               // endless loop
+
+self:  hint @pause
+       br.sptk.many self               // endless loop
 END(_start)
 
 GLOBAL_ENTRY(ia64_save_debug_regs)
-
To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to