From patchwork Tue Aug 12 17:20:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 4714281 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E8EC09F375 for ; Tue, 12 Aug 2014 17:23:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 286BE20160 for ; Tue, 12 Aug 2014 17:23:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4517E2014A for ; Tue, 12 Aug 2014 17:23:12 +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 1XHFkj-0002hz-0T; Tue, 12 Aug 2014 17:20:53 +0000 Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XHFkf-0002f3-L4 for linux-arm-kernel@lists.infradead.org; Tue, 12 Aug 2014 17:20:50 +0000 Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3hXgm83JsPz3hhpS; Tue, 12 Aug 2014 19:20:23 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3hXgm72dcjz7S6RY; Tue, 12 Aug 2014 19:20:23 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id ufDD20XQ39ad; Tue, 12 Aug 2014 19:20:22 +0200 (CEST) X-Auth-Info: U9Su56mIkKGnHk+IrkYaGeRLnXomMurkR25hGoCY/lQ= Received: from igel.home (ppp-188-174-144-4.dynamic.mnet-online.de [188.174.144.4]) by mail.mnet-online.de (Postfix) with ESMTPA; Tue, 12 Aug 2014 19:20:22 +0200 (CEST) Received: by igel.home (Postfix, from userid 1000) id 7AFCD2C09B6; Tue, 12 Aug 2014 19:20:22 +0200 (CEST) From: Andreas Schwab To: linux-kernel@vger.kernel.org Subject: [PATCH] arm/xen: fix wrong conflict resolution of xen merge X-Yow: If this is the DATING GAME I want to know your FAVORITE PLANET! Do I get th' MICROWAVE MOPED? Date: Tue, 12 Aug 2014 19:20:22 +0200 Message-ID: <87fvh1vd49.fsf@igel.home> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.92 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140812_102049_865562_0382D6F8 X-CRM114-Status: GOOD ( 11.49 ) X-Spam-Score: 0.0 (/) Cc: xen-devel@lists.xenproject.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove duplicate definition of arch_gnttab_init. Signed-off-by: Andreas Schwab --- arch/arm/xen/grant-table.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm/xen/grant-table.c b/arch/arm/xen/grant-table.c index 2c4041c..e437918 100644 --- a/arch/arm/xen/grant-table.c +++ b/arch/arm/xen/grant-table.c @@ -49,8 +49,3 @@ int arch_gnttab_init(unsigned long nr_shared) { return 0; } - -int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status) -{ - return 0; -}