[Xen-changelog] [xen-unstable] Merge

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alastair Tse <atse@xxxxxxxxxxxxx>
# Node ID 8e035701b9ffa91caf95e01cd89579ebb1f6bd98
# Parent  aab2b3f739d28d3f1b2417e95c32e35fab6f18f5
# Parent  58284e7494071cfb0388e9de3d35c17409e77d93
Merge
---
 xen/common/kexec.c         |   15 ++++-----------
 xen/include/public/kexec.h |    3 +--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff -r aab2b3f739d2 -r 8e035701b9ff xen/common/kexec.c
--- a/xen/common/kexec.c        Thu Dec 07 11:44:05 2006 +0000
+++ b/xen/common/kexec.c        Thu Dec 07 11:45:00 2006 +0000
@@ -160,13 +160,9 @@ static int kexec_get_reserve(xen_kexec_r
 
 extern unsigned long _text;
 
-static int kexec_get_xen(xen_kexec_range_t *range, int get_ma)
-{
-    if ( get_ma )
-        range->start = virt_to_maddr(&_text);
-    else
-        range->start = (unsigned long) &_text;
-
+static int kexec_get_xen(xen_kexec_range_t *range)
+{
+    range->start = virt_to_maddr(&_text);
     range->size = (unsigned long)&_end - (unsigned long)&_text;
     return 0;
 }
@@ -195,10 +191,7 @@ static int kexec_get_range(XEN_GUEST_HAN
         ret = kexec_get_reserve(&range);
         break;
     case KEXEC_RANGE_MA_XEN:
-        ret = kexec_get_xen(&range, 1);
-        break;
-    case KEXEC_RANGE_VA_XEN:
-        ret = kexec_get_xen(&range, 0);
+        ret = kexec_get_xen(&range);
         break;
     case KEXEC_RANGE_MA_CPU:
         ret = kexec_get_cpu(&range);
diff -r aab2b3f739d2 -r 8e035701b9ff xen/include/public/kexec.h
--- a/xen/include/public/kexec.h        Thu Dec 07 11:44:05 2006 +0000
+++ b/xen/include/public/kexec.h        Thu Dec 07 11:45:00 2006 +0000
@@ -107,8 +107,7 @@ typedef struct xen_kexec_load {
 
 #define KEXEC_RANGE_MA_CRASH 0   /* machine address and size of crash area */
 #define KEXEC_RANGE_MA_XEN   1   /* machine address and size of Xen itself */
-#define KEXEC_RANGE_VA_XEN   2   /* virtual adrress and size of Xen itself */
-#define KEXEC_RANGE_MA_CPU   3   /* machine address and size of a CPU note */
+#define KEXEC_RANGE_MA_CPU   2   /* machine address and size of a CPU note */
 
 /*
  * Find the address and size of certain memory areas

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