[Xen-ia64-devel] [PATCH][MCA] Fix dom0 fails with nomca option

[SUZUKI Kazuhiro <kaz@xxxxxxxxxxxxxx>]

Hi all,

   When "nomca" is specified to Xen and "salinfod" is started on dom0,
table lookup failed exception is occured. This patch fixes it.

Thanks,
KAZ

Signed-off-by: Kazuhiro Suzuki <kaz@xxxxxxxxxxxxxx>

diff -r 7e7846ea4ab3 xen/arch/ia64/linux-xen/mca.c
--- a/xen/arch/ia64/linux-xen/mca.c     Mon Nov 27 10:10:57 2006 -0700
+++ b/xen/arch/ia64/linux-xen/mca.c     Wed Nov 29 14:03:21 2006 +0900
@@ -155,7 +155,11 @@ static int cpe_poll_enabled = 1;
 
 extern void salinfo_log_wakeup(int type, u8 *buffer, u64 size, int irqsafe);
 
+#ifdef XEN
+int mca_init;
+#else
 static int mca_init;
+#endif
 
 /*
  * IA64_MCA log support
@@ -1606,7 +1610,7 @@ ia64_mca_cpu_init(void *cpu_data)
                }
        }
 #ifdef XEN
-       else {
+       else if (mca_init) {
                int i;
                for (i = 0; i < IA64_MAX_LOG_TYPES; i++)
                        ia64_log_queue(i, 0);
diff -r 7e7846ea4ab3 xen/arch/ia64/xen/fw_emul.c
--- a/xen/arch/ia64/xen/fw_emul.c       Mon Nov 27 10:10:57 2006 -0700
+++ b/xen/arch/ia64/xen/fw_emul.c       Tue Nov 28 18:29:22 2006 +0900
@@ -65,6 +65,7 @@ struct smp_call_args_t {
        void *data;
 }; 
 
+extern int mca_init;
 extern sal_log_record_header_t *sal_record;
 DEFINE_SPINLOCK(sal_record_lock);
 
@@ -213,7 +214,7 @@ sal_emulator (long index, unsigned long 
                        struct smp_call_args_t arg;
 
                        spin_lock_irqsave(&sal_queue_lock, flags);
-                       if (list_empty(&sal_queue[in1])) {
+                       if (!mca_init || list_empty(&sal_queue[in1])) {
                                sal_log_record_header_t header;
                                XEN_GUEST_HANDLE(void) handle =
                                        *(XEN_GUEST_HANDLE(void)*)&in3;

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel