From patchwork Mon Jun 6 17:00:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King X-Patchwork-Id: 9158843 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BFBFD60759 for ; Mon, 6 Jun 2016 17:03:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0E892833E for ; Mon, 6 Jun 2016 17:03:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5F592834D; Mon, 6 Jun 2016 17:03:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3426F2833E for ; Mon, 6 Jun 2016 17:03:22 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b9xuF-0004bK-CL; Mon, 06 Jun 2016 17:01:39 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b9xtz-0003ej-86 for linux-arm-kernel@lists.infradead.org; Mon, 06 Jun 2016 17:01:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2014; h=Date:Sender:Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References:In-Reply-To; bh=UfshztDbY5C0gGsJFbPMBWrCF0Whj7QbrpJb4rGJk+s=; b=k5CYlZ0jhGBnaRzqaAG/JF51dKQ4LkbeSmEalevV5zDLF8i97JGZNLiPirp0Nfpnyv32NQ6gpwoqLdsXTZdkTGy3Uit7BuxjWBL8dEtA0DhOzAEJ2cUXCNx3HizvrFK5RR3KHh/+j1hEZ8xwewZmugwts23RuaHR6RyHT+GCv9Y=; Received: from [fd8f:7570:feb6:1:b4eb:e902:622d:f2f0] (port=37672 helo=e0050434b2927.dyn.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLSv1:DHE-RSA-AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1b9xtO-0000J2-MD; Mon, 06 Jun 2016 18:00:47 +0100 Received: from rmk by e0050434b2927.dyn.armlinux.org.uk with local (Exim 4.82) (envelope-from ) id 1b9xtE-0003tY-W5; Mon, 06 Jun 2016 18:00:37 +0100 In-Reply-To: <20160606164129.GM1041@n2100.armlinux.org.uk> References: <20160606164129.GM1041@n2100.armlinux.org.uk> From: Russell King To: kexec@lists.infradead.org,linux-arm-kernel@lists.infradead.org Subject: [PATCH kexec-tools v2 22/32] arm: use generic mem_region sorting implementation MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 06 Jun 2016 18:00:36 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160606_100124_063033_F61E5C8B X-CRM114-Status: GOOD ( 11.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pratyush Anand , Baoquan He Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Use the generic mem_region sorting implementation. Reviewed-by: Pratyush Anand Signed-off-by: Russell King --- kexec/arch/arm/crashdump-arm.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c index 85afd9f..d6db566 100644 --- a/kexec/arch/arm/crashdump-arm.c +++ b/kexec/arch/arm/crashdump-arm.c @@ -202,19 +202,6 @@ static void crash_exclude_range(void) } } -static int range_cmp(const void *a1, const void *a2) -{ - const struct memory_range *r1 = a1; - const struct memory_range *r2 = a2; - - if (r1->start > r2->start) - return 1; - if (r1->start < r2->start) - return -1; - - return 0; -} - /** * crash_get_memory_ranges() - read system physical memory * @@ -246,8 +233,7 @@ static int crash_get_memory_ranges(void) /* * Make sure that the memory regions are sorted. */ - qsort(usablemem_rgns.ranges, usablemem_rgns.size, - sizeof(*usablemem_rgns.ranges), range_cmp); + mem_regions_sort(&usablemem_rgns); return 0; }