[Xen-changelog] [xen-unstable] [PATCH 02/02] Kexec / Kdump: Don't declare _end

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

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Node ID b08b870770f9dc35d0a069662ec5ec80704cdd37
# Parent  f4089172c96b02a04a9cf512eac8a888813fc15c
[PATCH 02/02] Kexec / Kdump: Don't declare _end

_end is already declared in xen/include/asm/config.h, so don't declare
it twice. This solves a powerpc/ia64 build problem where _end is declared
as char _end[] compared to unsigned long _end on x86.

Signed-Off-By: Magnus Damm <magnus@xxxxxxxxxxxxx>
---
 xen/common/kexec.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r f4089172c96b -r b08b870770f9 xen/common/kexec.c
--- a/xen/common/kexec.c        Mon Dec 04 09:08:47 2006 +0000
+++ b/xen/common/kexec.c        Mon Dec 04 09:08:47 2006 +0000
@@ -158,7 +158,7 @@ static int kexec_get_reserve(xen_kexec_r
     return 0;
 }
 
-extern unsigned long _text, _end;
+extern unsigned long _text;
 
 static int kexec_get_xen(xen_kexec_range_t *range, int get_ma)
 {
@@ -167,7 +167,7 @@ static int kexec_get_xen(xen_kexec_range
     else
         range->start = (unsigned long) &_text;
 
-    range->size = &_end - &_text;
+    range->size = (unsigned long)&_end - (unsigned long)&_text;
     return 0;
 }
 

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