ia64/xen-unstable

changeset 12838:8e035701b9ff

Merge
author Alastair Tse <atse@xensource.com>
date Thu Dec 07 11:45:00 2006 +0000 (2006-12-07)
parents aab2b3f739d2 58284e749407
children 5bf91da9797d 5aea6a32fc8b 9de4597e1269
files
line diff
     1.1 --- a/xen/common/kexec.c	Thu Dec 07 11:44:05 2006 +0000
     1.2 +++ b/xen/common/kexec.c	Thu Dec 07 11:45:00 2006 +0000
     1.3 @@ -160,13 +160,9 @@ static int kexec_get_reserve(xen_kexec_r
     1.4  
     1.5  extern unsigned long _text;
     1.6  
     1.7 -static int kexec_get_xen(xen_kexec_range_t *range, int get_ma)
     1.8 +static int kexec_get_xen(xen_kexec_range_t *range)
     1.9  {
    1.10 -    if ( get_ma )
    1.11 -        range->start = virt_to_maddr(&_text);
    1.12 -    else
    1.13 -        range->start = (unsigned long) &_text;
    1.14 -
    1.15 +    range->start = virt_to_maddr(&_text);
    1.16      range->size = (unsigned long)&_end - (unsigned long)&_text;
    1.17      return 0;
    1.18  }
    1.19 @@ -195,10 +191,7 @@ static int kexec_get_range(XEN_GUEST_HAN
    1.20          ret = kexec_get_reserve(&range);
    1.21          break;
    1.22      case KEXEC_RANGE_MA_XEN:
    1.23 -        ret = kexec_get_xen(&range, 1);
    1.24 -        break;
    1.25 -    case KEXEC_RANGE_VA_XEN:
    1.26 -        ret = kexec_get_xen(&range, 0);
    1.27 +        ret = kexec_get_xen(&range);
    1.28          break;
    1.29      case KEXEC_RANGE_MA_CPU:
    1.30          ret = kexec_get_cpu(&range);
     2.1 --- a/xen/include/public/kexec.h	Thu Dec 07 11:44:05 2006 +0000
     2.2 +++ b/xen/include/public/kexec.h	Thu Dec 07 11:45:00 2006 +0000
     2.3 @@ -107,8 +107,7 @@ typedef struct xen_kexec_load {
     2.4  
     2.5  #define KEXEC_RANGE_MA_CRASH 0   /* machine address and size of crash area */
     2.6  #define KEXEC_RANGE_MA_XEN   1   /* machine address and size of Xen itself */
     2.7 -#define KEXEC_RANGE_VA_XEN   2   /* virtual adrress and size of Xen itself */
     2.8 -#define KEXEC_RANGE_MA_CPU   3   /* machine address and size of a CPU note */
     2.9 +#define KEXEC_RANGE_MA_CPU   2   /* machine address and size of a CPU note */
    2.10  
    2.11  /*
    2.12   * Find the address and size of certain memory areas