From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mho-03-ewr.mailhop.org ([204.13.248.66] helo=mho-01-ewr.mailhop.org) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XCB2x-0001kX-7c for kexec@lists.infradead.org; Tue, 29 Jul 2014 17:18:49 +0000 Received: from cpe-65-185-103-201.woh.res.rr.com ([65.185.103.201] helo=marth.benkay.net) by mho-01-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1XCB2U-0007gM-Dp for kexec@lists.infradead.org; Tue, 29 Jul 2014 17:18:14 +0000 Received: from samoflange.localnet (uch-securewireless-pat.uc.edu [129.137.215.230]) (Authenticated sender: benjamin) by marth.benkay.net (Postfix) with ESMTPSA id DFA5C360E73 for ; Tue, 29 Jul 2014 13:18:12 -0400 (EDT) From: Benjamin Kay Subject: Re: [PATCH] kexec: Fix callback parameter types Date: Tue, 29 Jul 2014 13:18:11 -0400 Message-ID: <30581068.8nhrM5BQlL@samoflange> In-Reply-To: <20140729154001.Sx1ujgo15C8oflxb@hankala.org> References: <20140729154001.Sx1ujgo15C8oflxb@hankala.org> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: kexec@lists.infradead.org Thanks, this was causing kexec to refuse to load a crash kernel on my i686 system. On Tuesday, July 29, 2014 15:51:03 Visa Hankala wrote: > Commit 4362bfaca4d8d2a4380532880f0d08c2bf14184e changed > kexec_iomem_for_each_line() to pass 'base' and 'length' parameters of > the callback function as unsigned long long integers instead of unsigned > longs. Some of the functions were not updated. This patch corrects the > remaining instances. > > Signed-off-by: Visa Hankala > --- > kexec/arch/i386/crashdump-x86.c | 4 ++-- > kexec/arch/sh/crashdump-sh.c | 4 ++-- > kexec/arch/sh/kexec-sh.c | 4 ++-- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/kexec/arch/i386/crashdump-x86.c > b/kexec/arch/i386/crashdump-x86.c index 77bdad5..82bf239 100644 > --- a/kexec/arch/i386/crashdump-x86.c > +++ b/kexec/arch/i386/crashdump-x86.c > @@ -1041,8 +1041,8 @@ int get_max_crash_kernel_limit(uint64_t *start, > uint64_t *end) > > static int crashkernel_mem_callback(void *UNUSED(data), int nr, > char *UNUSED(str), > - unsigned long base, > - unsigned long length) > + unsigned long long base, > + unsigned long long length) > { > if (nr >= CRASH_RESERVED_MEM_NR) > return 1; > diff --git a/kexec/arch/sh/crashdump-sh.c b/kexec/arch/sh/crashdump-sh.c > index fe11b17..9e6af6b 100644 > --- a/kexec/arch/sh/crashdump-sh.c > +++ b/kexec/arch/sh/crashdump-sh.c > @@ -34,8 +34,8 @@ static struct memory_range > crash_memory_range[CRASH_MAX_MEMORY_RANGES]; static int crash_sh_range_nr; > static int crash_sh_memory_range_callback(void *UNUSED(data), int > UNUSED(nr), char *str, > - unsigned long base, > - unsigned long length) > + unsigned long long base, > + unsigned long long length) > { > > struct memory_range *range = crash_memory_range; > diff --git a/kexec/arch/sh/kexec-sh.c b/kexec/arch/sh/kexec-sh.c > index aea5dfb..ce341c8 100644 > --- a/kexec/arch/sh/kexec-sh.c > +++ b/kexec/arch/sh/kexec-sh.c > @@ -24,8 +24,8 @@ static struct memory_range > memory_range[MAX_MEMORY_RANGES]; > > static int kexec_sh_memory_range_callback(void *UNUSED(data), int nr, > char *UNUSED(str), > - unsigned long base, > - unsigned long length) > + unsigned long long base, > + unsigned long long length) > { > if (nr < MAX_MEMORY_RANGES) { > memory_range[nr].start = base; > > _______________________________________________ > kexec mailing list > kexec@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/kexec _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec