patch-2.4.14 linux/arch/sparc/kernel/sparc-stub.c

• Lines: 89
• Date: Tue Oct 30 15:08:11 2001
• Orig file: v2.4.13/linux/arch/sparc/kernel/sparc-stub.c
• Orig date: Tue Oct 10 10:33:51 2000

diff -u --recursive --new-file v2.4.13/linux/arch/sparc/kernel/sparc-stub.c linux/arch/sparc/kernel/sparc-stub.c
@@ -1,4 +1,4 @@
-/* $Id: sparc-stub.c,v 1.27 2000/10/03 07:28:49 anton Exp $
+/* $Id: sparc-stub.c,v 1.28 2001/10/30 04:54:21 davem Exp $
  * sparc-stub.c:  KGDB support for the Linux kernel.
  *
  * Modifications to run under Linux
@@ -330,17 +330,19 @@
 		 * to arrange for a "return 0" upon a memory fault
 		 */
 		__asm__(
-			"1:	ldub [%0], %1
-				inc %0
-				.section .fixup,#alloc,#execinstr
-				.align 4
-			 2:	retl
-				 mov 0, %%o0
-				.section __ex_table, #alloc
-				.align 4
-				.word 1b, 2b
-				.text"
-					: "=r" (mem), "=r" (ch) : "0" (mem));
+			"\n1:\n\t"
+			"ldub [%0], %1\n\t"
+			"inc %0\n\t"
+			".section .fixup,#alloc,#execinstr\n\t"
+			".align 4\n"
+			"2:\n\t"
+			"retl\n\t"
+			" mov 0, %%o0\n\t"
+			".section __ex_table, #alloc\n\t"
+			".align 4\n\t"
+			".word 1b, 2b\n\t"
+			".text\n"
+			: "=r" (mem), "=r" (ch) : "0" (mem));
 		*buf++ = hexchars[ch >> 4];
 		*buf++ = hexchars[ch & 0xf];
 	}
@@ -364,17 +366,19 @@
 		ch |= hex(*buf++);
 		/* Assembler code is   *mem++ = ch;   with return 0 on fault */
 		__asm__(
-			"1:	stb %1, [%0]
-				inc %0
-				.section .fixup,#alloc,#execinstr
-				.align 4
-			 2:	retl
-				 mov 0, %%o0
-				.section __ex_table, #alloc
-				.align 4
-				.word 1b, 2b
-				.text"
-					: "=r" (mem) : "r" (ch) , "0" (mem));
+			"\n1:\n\t"
+			"stb %1, [%0]\n\t"
+			"inc %0\n\t"
+			".section .fixup,#alloc,#execinstr\n\t"
+			".align 4\n"
+			"2:\n\t"
+			"retl\n\t"
+			" mov 0, %%o0\n\t"
+			".section __ex_table, #alloc\n\t"
+			".align 4\n\t"
+			".word 1b, 2b\n\t"
+			".text\n"
+			: "=r" (mem) : "r" (ch) , "0" (mem));
 	}
 	return mem;
 }
@@ -715,14 +719,12 @@
 
 	/* Again, watch those c-prefixes for ELF kernels */
 #if defined(__svr4__) || defined(__ELF__)
-	asm("	.globl breakinst
-
-	     breakinst: ta 1
-            ");
+	asm(".globl breakinst\n"
+	    "breakinst:\n\t"
+	    "ta 1\n");
 #else
-	asm("	.globl _breakinst
-
-	     _breakinst: ta 1
-            ");
+	asm(".globl _breakinst\n"
+	    "_breakinst:\n\t"
+	    "ta 1\n");
 #endif
 }