From mboxrd@z Thu Jan 1 00:00:00 1970 From: Magnus Damm Subject: [PATCH 02/02] Kexec / Kdump: Don't declare _end Date: Mon, 04 Dec 2006 13:35:38 +0900 Message-ID: <20061204043538.25410.29650.sendpatchset@localhost> References: <20061204043528.25410.42087.sendpatchset@localhost> Return-path: In-Reply-To: <20061204043528.25410.42087.sendpatchset@localhost> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Ian Campbell Cc: xen-devel@lists.xensource.com, magnus.damm@gmail.com, Akio Takebe , Magnus Damm , Alex Williamson List-Id: xen-devel@lists.xenproject.org [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 --- Applies on top of xen-unstable-12717. xen/common/kexec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- 0001/xen/common/kexec.c +++ work/xen/common/kexec.c 2006-12-04 12:45:57.000000000 +0900 @@ -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; }