patch-2.4.4 linux/include/asm-ia64/mca.h

Next file: linux/include/asm-ia64/mca_asm.h
Previous file: linux/include/asm-ia64/machvec_sn1.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.3/linux/include/asm-ia64/mca.h linux/include/asm-ia64/mca.h
@@ -1,6 +1,6 @@
 /*
- * File: 	mca.h
- * Purpose: 	Machine check handling specific defines
+ * File:	mca.h
+ * Purpose:	Machine check handling specific defines
  *
  * Copyright (C) 1999 Silicon Graphics, Inc.
  * Copyright (C) Vijay Chander (vijay@engr.sgi.com)
@@ -18,7 +18,6 @@
 #include <asm/param.h>
 #include <asm/sal.h>
 #include <asm/processor.h>
-#include <asm/hw_irq.h>
 
 /* These are the return codes from all the IA64_MCA specific interfaces */
 typedef	int ia64_mca_return_code_t;
@@ -30,11 +29,6 @@
 
 #define IA64_MCA_RENDEZ_TIMEOUT		(100 * HZ)	/* 1000 milliseconds */
 
-/* Interrupt vectors reserved for MC handling. */
-#define IA64_MCA_RENDEZ_INT_VECTOR	MCA_RENDEZ_IRQ	/* Rendez interrupt */
-#define IA64_MCA_WAKEUP_INT_VECTOR	MCA_WAKEUP_IRQ	/* Wakeup interrupt */
-#define IA64_MCA_CMC_INT_VECTOR		CMC_IRQ	/* Correctable machine check interrupt */
-
 #define IA64_CMC_INT_DISABLE		0
 #define IA64_CMC_INT_ENABLE		1
 
@@ -45,7 +39,7 @@
 typedef union cmcv_reg_u {
 	u64	cmcv_regval;
 	struct	{
-		u64  	cmcr_vector		: 8;
+		u64	cmcr_vector		: 8;
 		u64	cmcr_reserved1		: 4;
 		u64	cmcr_ignored1		: 1;
 		u64	cmcr_reserved2		: 3;
@@ -63,15 +57,15 @@
 #define IA64_INIT_HANDLER_SIZE		0x10
 
 enum {
-	IA64_MCA_RENDEZ_CHECKIN_NOTDONE	= 	0x0,
-	IA64_MCA_RENDEZ_CHECKIN_DONE 	= 	0x1
+	IA64_MCA_RENDEZ_CHECKIN_NOTDONE	=	0x0,
+	IA64_MCA_RENDEZ_CHECKIN_DONE	=	0x1
 };
 
 #define IA64_MAXCPUS	64	/* Need to do something about this */
 
 /* Information maintained by the MC infrastructure */
 typedef struct ia64_mc_info_s {
-	u64		imi_mca_handler;		
+	u64		imi_mca_handler;
 	size_t		imi_mca_handler_size;
 	u64		imi_monarch_init_handler;
 	size_t		imi_monarch_init_handler_size;
@@ -85,7 +79,7 @@
  * handoff
  */
 enum {
-	IA64_MCA_RENDEZ_NOT_RQD 		= 	0x0,
+	IA64_MCA_RENDEZ_NOT_RQD		=	0x0,
 	IA64_MCA_RENDEZ_DONE_WITHOUT_INIT	=	0x1,
 	IA64_MCA_RENDEZ_DONE_WITH_INIT		=	0x2,
 	IA64_MCA_RENDEZ_FAILURE			=	-1
@@ -103,12 +97,12 @@
 } ia64_mca_sal_to_os_state_t;
 
 enum {
-	IA64_MCA_CORRECTED 	= 	0x0,	/* Error has been corrected by OS_MCA */
+	IA64_MCA_CORRECTED	=	0x0,	/* Error has been corrected by OS_MCA */
 	IA64_MCA_WARM_BOOT	=	-1,	/* Warm boot of the system need from SAL */
 	IA64_MCA_COLD_BOOT	=	-2,	/* Cold boot of the system need from SAL */
 	IA64_MCA_HALT		=	-3	/* System to be halted by SAL */
 };
-	
+
 typedef struct ia64_mca_os_to_sal_state_s {
 	u64		imots_os_status;	/*   OS status to SAL as to what happened
 						 *   with the MCA handling.
@@ -138,7 +132,7 @@
 
 #define PLATFORM_CALL(fn, args)	printk("Platform call TBD\n")
 
-#undef 	MCA_TEST
+#undef	MCA_TEST
 
 #define IA64_MCA_DEBUG_INFO 1
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)