Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

--- 2010-06-15.orig/xen/arch/x86/cpu/mcheck/mce.c	2010-06-14 08:49:36.000000000 +0200
+++ 2010-06-15/xen/arch/x86/cpu/mcheck/mce.c	2010-07-06 14:44:53.000000000 +0200
@@ -936,7 +936,7 @@ static void do_mc_get_cpu_info(void *v)
      * Deal with sparse masks, condensed into a contig array.
      */
     while (cpn >= 0) {
-        if (cpu_isset(cpn, cpu_online_map))
+        if (cpu_online(cpn))
             cindex++;
         cpn--;
     }
@@ -1417,7 +1417,7 @@ long do_mca(XEN_GUEST_HANDLE(xen_mc_t) u
         if (target >= NR_CPUS)
             return x86_mcerr("do_mca inject: bad target", -EINVAL);
 
-        if (!cpu_isset(target, cpu_online_map))
+        if (!cpu_online(target))
             return x86_mcerr("do_mca inject: target offline",
                              -EINVAL);
 
@@ -1444,7 +1444,7 @@ long do_mca(XEN_GUEST_HANDLE(xen_mc_t) u
         if (target >= NR_CPUS)
             return x86_mcerr("do_mca #MC: bad target", -EINVAL);
 
-        if (!cpu_isset(target, cpu_online_map))
+        if (!cpu_online(target))
             return x86_mcerr("do_mca #MC: target offline", -EINVAL);
 
         add_taint(TAINT_ERROR_INJECT);