~ubuntu-branches/ubuntu/precise/xen/precise

« back to all changes in this revision

Viewing changes to xen/arch/x86/cpu/mcheck/mce.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-07-19 00:11:08 UTC
  • mfrom: (0.2.1) (1.3.1) (15.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20110719001108-y6f986pvtfxp7l6i
Tags: 4.1.1-1ubuntu1
* Merge from debian unstable.  Remaining changes:
  + Xen 3.3 -> Xen 4.1 migration:
    - libxenstore3.0: Conflict and replaces libxen3.
    - libxen-dev: Conflict and replaces libxen3-dev.
    - xenstore-utils: Conflict and replaces libxen3.
    - xen-utils-4.1: Conflict and replaces libxen3, python-xen-3.3,
      and xen-utils-4.1.
  + Make sure the LDFLAGS value passed is suitable for use by ld
    rather than gcc.
  + Dropped upstream patches:
    - debian/patches/disable-unused-but-not-set-error.patch:
      Applied upstream.
    - debian/patches/xc-dom-restore-set-but-not-used.patch:
      Applied upstream.
    - debian/patches/xc-dom-restore-set-but-not-used.patch:
      Applied upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
932
932
        printk(XENLOG_WARNING
933
933
               "CPU%d: Machine Check Exception: %16"PRIx64"\n",
934
934
               mc_global->mc_coreid, mc_global->mc_gstatus);
935
 
    } else {
936
 
        printk(XENLOG_WARNING "MCE: The hardware reports a non "
937
 
               "fatal, correctable incident occurred on "
938
 
               "CPU %d.\n",
 
935
    } else if (mc_global->mc_flags & MC_FLAG_CMCI) {
 
936
        printk(XENLOG_WARNING "CMCI occurred on CPU %d.\n", 
 
937
               mc_global->mc_coreid);
 
938
    } else if (mc_global->mc_flags & MC_FLAG_POLLED) {
 
939
        printk(XENLOG_WARNING "POLLED occurred on CPU %d.\n",
939
940
               mc_global->mc_coreid);
940
941
    }
941
942