Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3095069rwb; Mon, 15 Aug 2022 18:00:39 -0700 (PDT) X-Google-Smtp-Source: AA6agR7Zf86TXl/GHRqPR32gFOxgpzi9NCr6gy55fS8nI533z1uypC1eo2ym17bDhRdnpizFxgHB X-Received: by 2002:a05:6402:11cd:b0:43d:7862:7c25 with SMTP id j13-20020a05640211cd00b0043d78627c25mr16955686edw.96.1660611639393; Mon, 15 Aug 2022 18:00:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660611639; cv=none; d=google.com; s=arc-20160816; b=e2MlrVAJX4q9U5TNODzgc2gLCGfp4kfZ/M26j0U74J/DzGN8ZGFzMLD8WD11JYMC7G NGlUob+mCs3vIMkzBQPCRaihpNyrEqeU0sz4bwqCZRSVnlnyBGp3P4SSKv5b7A//Fm2P eCn8BLwm9ZjP6cH0njYH4cSqmu3cfFDGg7XyyV4bqwT9oT6QmLL+FVOakvaO5MzVJRXt DMUHKn72J8icI9CXkhWQhleJCSRafvsKQATfqP+BaFST4isdPx1HI6GmP3oMmrNFaj6T 4Tsg7vZqMMsS2gcSCv8qKw+r5kbVDTAl6mUMwBo8euDqeXTuHi1FYWvVtOIYj5MMYqjl DBHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=msF119r5a3kwV7eBfHdRL1WZc9lw5pwSW2z1iZeE1TE=; b=GV9SrsvHFKAnLF46YgI7T9lvfXQEwPITTcGY430UInHUnC1lWXPOr2hpnWL/QWXpCw 0/bwPKqmYD7yutt3KRxlgdOXh4U5VKqvp+jg1LK7dQEBDm9oz5YItSvFAev0Une1uAlN eRJO+3KUWLIf8ViRwg11fjtnoG7X/WBqCEGFo4sknjCA39+7QUdr/BKIqH4U7BmZU35h O6IXcWxpNuUhS/2sWuMs12FboH3FFhW/PLOVV6LOMExFEg2JWn3MVGu23egW8J41HqRF 1Ehyy2GJfHWf0HRoWvfgk80E8Ya0uCCWSKEzeoX3V2GoSS7VGz3LdMSouUsjNaFTujSY y6cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZeLVLzIA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e10-20020aa7d7ca000000b0043d708d50c2si8450996eds.159.2022.08.15.18.00.13; Mon, 15 Aug 2022 18:00:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZeLVLzIA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343762AbiHPA4Q (ORCPT + 99 others); Mon, 15 Aug 2022 20:56:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244612AbiHPAuD (ORCPT ); Mon, 15 Aug 2022 20:50:03 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A841B5160; Mon, 15 Aug 2022 13:46:00 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id B9A32B80EB1; Mon, 15 Aug 2022 20:45:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D0A11C433D6; Mon, 15 Aug 2022 20:45:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660596357; bh=V2/mh1k9Uk+itrV3o3kw5XDjTceOvOUITZxxSgSKmPg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZeLVLzIAa9Zs2hlVgrYXZdeTmzTRt6qbuw+QW6MySEfuY4rle2O9M3GFKYKJSpLiZ b+5p84Z69ihN7ZCDg3eIv3jyB7Nk2h6SBuHk7nqYkyWHfTxjroIv7zhS+uNLC7vnbD M2FM4dJ+qNiojf/0ihRly++iUUkO76C531s4LwfQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guo Ren , Guo Ren Subject: [PATCH 5.19 1055/1157] csky: abiv1: Fixup compile error Date: Mon, 15 Aug 2022 20:06:51 +0200 Message-Id: <20220815180522.260637041@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guo Ren commit 45fef4c4b9c94e86d9c13f0b2e7e71bb32254509 upstream. LD vmlinux.o arch/csky/lib/string.o: In function `memmove': string.c:(.text+0x108): multiple definition of `memmove' lib/string.o:string.c:(.text+0x7e8): first defined here arch/csky/lib/string.o: In function `memset': string.c:(.text+0x148): multiple definition of `memset' lib/string.o:string.c:(.text+0x2ac): first defined here scripts/Makefile.vmlinux_o:68: recipe for target 'vmlinux.o' failed make[4]: *** [vmlinux.o] Error 1 Fixes: e4df2d5e852a ("csky: Add C based string functions") Signed-off-by: Guo Ren Signed-off-by: Guo Ren Cc: Signed-off-by: Greg Kroah-Hartman --- arch/csky/abiv1/inc/abi/string.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/csky/abiv1/inc/abi/string.h b/arch/csky/abiv1/inc/abi/string.h index 9d95594b0feb..de50117b904d 100644 --- a/arch/csky/abiv1/inc/abi/string.h +++ b/arch/csky/abiv1/inc/abi/string.h @@ -6,4 +6,10 @@ #define __HAVE_ARCH_MEMCPY extern void *memcpy(void *, const void *, __kernel_size_t); +#define __HAVE_ARCH_MEMMOVE +extern void *memmove(void *, const void *, __kernel_size_t); + +#define __HAVE_ARCH_MEMSET +extern void *memset(void *, int, __kernel_size_t); + #endif /* __ABI_CSKY_STRING_H */ -- 2.37.2