patch-2.2.11 linux/arch/sparc64/kernel/trampoline.S

• Lines: 22
• Date: Mon Aug 9 12:05:45 1999
• Orig file: v2.2.10/linux/arch/sparc64/kernel/trampoline.S
• Orig date: Wed Mar 10 16:53:37 1999

diff -u --recursive --new-file v2.2.10/linux/arch/sparc64/kernel/trampoline.S linux/arch/sparc64/kernel/trampoline.S
@@ -1,4 +1,4 @@
-/* $Id: trampoline.S,v 1.8 1998/12/09 21:01:15 davem Exp $
+/* $Id: trampoline.S,v 1.8.2.1 1999/08/09 13:00:27 davem Exp $
  * trampoline.S: Jump start slave processors on sparc64.
  *
  * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
@@ -23,6 +23,15 @@
 	.globl		sparc64_cpu_startup, sparc64_cpu_startup_end
 sparc64_cpu_startup:
 	flushw
+#if 1
+	/* XXX Disable reception of correctable memory errors until
+	 * XXX we code up the proper handler... -DaveM
+	 */
+	ldxa	[%g0] ASI_ESTATE_ERROR_EN, %g1
+	andn	%g1, 0x1, %g1
+	stxa	%g1, [%g0] ASI_ESTATE_ERROR_EN
+	membar	#Sync
+#endif
 	mov	(LSU_CONTROL_IC | LSU_CONTROL_DC | LSU_CONTROL_IM | LSU_CONTROL_DM), %g1
 	stxa	%g1, [%g0] ASI_LSU_CONTROL
 	membar	#Sync