[XenPPC] [linux-ppc-2.6] merge

[Xen patchbot-linux-ppc-2.6 <patchbot-linux-ppc-2.6@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
# Node ID 71efe9fd549ebf3bf6d1d3b6d7bda4f7cb8171ba
# Parent  116bf9210b61b0c487ce9e4b77693c47691513b2
# Parent  f7363a56e7c7bf0acd2a48a0e056184afc5ee23f
merge
---
 arch/powerpc/platforms/xen/hcall.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 116bf9210b61 -r 71efe9fd549e arch/powerpc/platforms/xen/hcall.c
--- a/arch/powerpc/platforms/xen/hcall.c        Sun Oct 08 13:54:00 2006 -0400
+++ b/arch/powerpc/platforms/xen/hcall.c        Sun Oct 08 13:55:59 2006 -0400
@@ -469,7 +469,7 @@ int HYPERVISOR_memory_op(unsigned int cm
                                        cmd, NULL);
                break;
        default:
-               printk(KERN_ERR "%s: unknown grant table op %d\n", __func__, 
cmd);
+               printk(KERN_ERR "%s: unknown memory op %d\n", __func__, cmd);
                ret = -ENOSYS;
        }
        xencomm_free(op_desc);

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