ia64/xen-unstable

changeset 19411:c657fc593306

mcheck: Small fix to Intel CMCI code

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Fri Mar 20 08:44:54 2009 +0000 (2009-03-20)
parents 3dcb5ad8be0c
children 532e25fda238
files xen/arch/x86/cpu/mcheck/mce_intel.c
line diff
     1.1 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c	Fri Mar 20 08:43:53 2009 +0000
     1.2 +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c	Fri Mar 20 08:44:54 2009 +0000
     1.3 @@ -198,7 +198,6 @@ static void cmci_discover(void)
     1.4  {
     1.5      unsigned long flags;
     1.6      int i;
     1.7 -    struct mc_info *mi = NULL;
     1.8      mctelem_cookie_t mctc;
     1.9      struct mca_summary bs;
    1.10  
    1.11 @@ -226,7 +225,7 @@ static void cmci_discover(void)
    1.12              mctelem_commit(mctc);
    1.13              send_guest_global_virq(dom0, VIRQ_MCA);
    1.14          } else {
    1.15 -            x86_mcinfo_dump(mi);
    1.16 +            x86_mcinfo_dump(mctelem_dataptr(mctc));
    1.17              mctelem_dismiss(mctc);
    1.18         }
    1.19      } else if (mctc != NULL)
    1.20 @@ -326,7 +325,6 @@ static void intel_init_cmci(struct cpuin
    1.21  
    1.22  fastcall void smp_cmci_interrupt(struct cpu_user_regs *regs)
    1.23  {
    1.24 -    struct mc_info *mi = NULL;
    1.25      mctelem_cookie_t mctc;
    1.26      struct mca_summary bs;
    1.27  
    1.28 @@ -341,9 +339,9 @@ fastcall void smp_cmci_interrupt(struct 
    1.29              mctelem_commit(mctc);
    1.30              send_guest_global_virq(dom0, VIRQ_MCA);
    1.31          } else {
    1.32 -            x86_mcinfo_dump(mi);
    1.33 +            x86_mcinfo_dump(mctelem_dataptr(mctc));
    1.34              mctelem_dismiss(mctc);
    1.35 -       }
    1.36 +        }
    1.37      } else if (mctc != NULL)
    1.38          mctelem_dismiss(mctc);
    1.39