From patchwork Wed Nov 14 22:21:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151125 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6247222ljp; Wed, 14 Nov 2018 14:22:21 -0800 (PST) X-Google-Smtp-Source: AJdET5ffILSfjOKIknmdiLrvi9g9vSfMyGFvg3KGdpwl57JOhqSCbKY0uAJKer+OMstygf0OH4Gy X-Received: by 2002:a17:902:b498:: with SMTP id y24-v6mr3756997plr.179.1542234141791; Wed, 14 Nov 2018 14:22:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542234141; cv=none; d=google.com; s=arc-20160816; b=yooBcnAZ5sb1fOzt4PXpZv0DpgTKxzNaQDMD+d4pFVLuJlkO3jQz0rcsqnskCqIz95 L3Mxei6H1aDRmMsJqMgsxzn29TLf4e4OkKPVkPsIuRzD5um3yoi56wcDzobqFu7CIlf5 P037B1ssvtb6w4JN897SqORjJdVqnLSP04j6bV09bAHhh/fze+m6gwKZBB2OLaDeqIUm v8+eJnqEVcgQhvENDLRCRcUwO6Qb47DKtbzBRWCRLwgnWa3ovtwaY5tU0gTuBhes1AkP YUvgXrs/M/nh+0+Dx/KbjcChgpfd25srahE3awqbUoq5wrfa7SVcVyIu9xisqD/MigiB TR7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=YzN2BCgSKS56OAIN3clOZ/GDAyZyA0xi0cZN+5E3T6Y=; b=Hw1z58uambNJu5n9CLjlrHUT9+Ig/djhhp0pozQH85kTMb42RGBMXbZ/RxPTQSPf8D v1ghW//m8bUO5IAzGMfBhkx1svcyappKpvAFhTc0eNR4FHFpqg1QRz/8fRc59DlRKOTh c5AilQpi7TtmAHPxBbfZegDPjyXgT+8PZzVlLOKk1KHza9F/kwCupokxAr/G7Yqcab8N +M9sp3zdLoSLfzV5nDaQJzwaaTEzrx4lA0NciafEmsFCl/Jpo/zOYAtr7nnSAJFNrrGK 4X1+NgoMjenx3fjNimaYuyAZNy3fyJv5hciKS2f/5SbLX1uj3NuSYzwwh8iKM8vQ4BhC mVGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=o92YglzZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o6-v6si29247129pfa.162.2018.11.14.14.22.21; Wed, 14 Nov 2018 14:22:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=o92YglzZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728855AbeKOI1W (ORCPT + 32 others); Thu, 15 Nov 2018 03:27:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:34470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728689AbeKOI1V (ORCPT ); Thu, 15 Nov 2018 03:27:21 -0500 Received: from sasha-vm.mshome.net (unknown [64.114.255.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9B2312252D; Wed, 14 Nov 2018 22:22:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542234137; bh=ySSQ3pcYerKH4OiBJKAgte5YYA9tT0QRHveHFw8BwvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o92YglzZSJB+kiKzWt9fGg2Ul7JUnALoEOiNDmR5PoWijYQY/dof1ViRBrMcz6rz7 TGKAi6UAPICEUHSVlNEy3WdnwfuEtyLSqkP3nRxpyap4HopvrWSqlZYz0p0R9kyhg/ SK2Exwsg82E0A3avtQHys1vd27msPJJX67G440pc= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jeremy Linton , Catalin Marinas , Sasha Levin Subject: [PATCH AUTOSEL 4.19 39/73] lib/raid6: Fix arm64 test build Date: Wed, 14 Nov 2018 17:21:33 -0500 Message-Id: <20181114222207.98701-39-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181114222207.98701-1-sashal@kernel.org> References: <20181114222207.98701-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeremy Linton [ Upstream commit 313a06e636808387822af24c507cba92703568b1 ] The lib/raid6/test fails to build the neon objects on arm64 because the correct machine type is 'aarch64'. Once this is correctly enabled, the neon recovery objects need to be added to the build. Reviewed-by: Ard Biesheuvel Signed-off-by: Jeremy Linton Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- lib/raid6/test/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/lib/raid6/test/Makefile b/lib/raid6/test/Makefile index 5d73f5cb4d8a..79777645cac9 100644 --- a/lib/raid6/test/Makefile +++ b/lib/raid6/test/Makefile @@ -27,7 +27,7 @@ ifeq ($(ARCH),arm) CFLAGS += -I../../../arch/arm/include -mfpu=neon HAS_NEON = yes endif -ifeq ($(ARCH),arm64) +ifeq ($(ARCH),aarch64) CFLAGS += -I../../../arch/arm64/include HAS_NEON = yes endif @@ -41,7 +41,7 @@ ifeq ($(IS_X86),yes) gcc -c -x assembler - >&/dev/null && \ rm ./-.o && echo -DCONFIG_AS_AVX512=1) else ifeq ($(HAS_NEON),yes) - OBJS += neon.o neon1.o neon2.o neon4.o neon8.o + OBJS += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1 else HAS_ALTIVEC := $(shell printf '\#include \nvector int a;\n' |\