- Update Xen patches to 3.3-rc5 and c/s 1157.

[linux-flexiantxendom0-3.2.10.git] / include / xen / hvm.h

diff --git a/include/xen/hvm.h b/include/xen/hvm.h
index b193fa2..b883740 100644 (file)
--- a/include/xen/hvm.h
+++ b/include/xen/hvm.h
@@ -3,7 +3,9 @@
 #define XEN_HVM_H__
 
 #include <xen/interface/hvm/params.h>
+#ifndef HAVE_XEN_PLATFORM_COMPAT_H
 #include <asm/xen/hypercall.h>
+#endif
 
 static inline int hvm_get_parameter(int idx, uint64_t *value)
 {
@@ -14,8 +16,7 @@ static inline int hvm_get_parameter(int idx, uint64_t *value)
        xhv.index = idx;
        r = HYPERVISOR_hvm_op(HVMOP_get_param, &xhv);
        if (r < 0) {
-               printk(KERN_ERR "Cannot get hvm parameter %d: %d!\n",
-                       idx, r);
+               pr_err("Cannot get hvm parameter %d: %d!\n", idx, r);
                return r;
        }
        *value = xhv.value;