# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1129  -> 1.1130
#	arch/ppc64/kernel/ras.c	1.4     -> 1.5
#	include/asm-ppc64/rtas.h	1.7     -> 1.8
#	arch/ppc64/kernel/traps.c	1.9     -> 1.10
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/10/17	olof@olof.austin.ibm.com	1.1130
# Change INTERNAL_ERROR to RTAS_INTERNAL_ERROR to avoid name conflict
# with the INTERNAL_ERROR defined in the SCSI subsystem.
# --------------------------------------------
#
diff -Nru a/arch/ppc64/kernel/ras.c b/arch/ppc64/kernel/ras.c
--- a/arch/ppc64/kernel/ras.c	Fri Oct 17 16:28:45 2003
+++ b/arch/ppc64/kernel/ras.c	Fri Oct 17 16:28:45 2003
@@ -139,7 +139,7 @@

 	status = rtas_call(rtas_token("check-exception"), 6, 1, NULL,
 			   0x500, irq,
-			   INTERNAL_ERROR,
+			   RTAS_INTERNAL_ERROR,
 			   1, /* Time Critical */
 			   __pa(&log_entry), size);

diff -Nru a/arch/ppc64/kernel/traps.c b/arch/ppc64/kernel/traps.c
--- a/arch/ppc64/kernel/traps.c	Fri Oct 17 16:28:45 2003
+++ b/arch/ppc64/kernel/traps.c	Fri Oct 17 16:28:45 2003
@@ -250,7 +250,7 @@
   		 * of SRR1 could be passed as the extended info argument.
   		 */
   		status = rtas_call(rtas_token("check-exception"), 6, 1, NULL,
-  				   0x200, (uint)srr1, INTERNAL_ERROR, 0,
+  				   0x200, (uint)srr1, RTAS_INTERNAL_ERROR, 0,
   				   __pa(mce_data_buf), RTAS_ERROR_LOG_MAX);
   		if (status == 0)
 			log_error((char *)mce_data_buf, ERR_TYPE_RTAS_LOG, 1);
diff -Nru a/include/asm-ppc64/rtas.h b/include/asm-ppc64/rtas.h
--- a/include/asm-ppc64/rtas.h	Fri Oct 17 16:28:45 2003
+++ b/include/asm-ppc64/rtas.h	Fri Oct 17 16:28:45 2003
@@ -62,7 +62,7 @@
 };

 /* Event classes */
-#define INTERNAL_ERROR		0x80000000 /* set bit 0 */
+#define RTAS_INTERNAL_ERROR	0x80000000 /* set bit 0 */
 #define EPOW_WARNING		0x40000000 /* set bit 1 */
 #define POWERMGM_EVENTS		0x20000000 /* set bit 2 */
 #define HOTPLUG_EVENTS		0x10000000 /* set bit 3 */