patch-2.3.14 linux/arch/m68k/kernel/head.S

• Lines: 19
• Date: Sun Aug 15 11:47:29 1999
• Orig file: v2.3.13/linux/arch/m68k/kernel/head.S
• Orig date: Tue May 11 09:57:14 1999

diff -u --recursive --new-file v2.3.13/linux/arch/m68k/kernel/head.S linux/arch/m68k/kernel/head.S
@@ -503,10 +503,18 @@
 
 .macro	puts		string
 #if defined(CONSOLE) || defined(SERIAL_DEBUG)
+/* The __INITDATA stuff is a no-op when ftrace or kgdb are turned on */
+#if defined(CONFIG_FTRACE) || defined(CONFIG_KGDB)
+	bra 1f
+#endif
 	__INITDATA
 .Lstr\@:
 	.string	"\string"
 	__FINIT
+#if defined(CONFIG_FTRACE) || defined(CONFIG_KGDB)
+	.align 2
+1:
+#endif
 	pea	%pc@(.Lstr\@)
 	func_call	puts
 	addql	#4,%sp