From patchwork Wed Nov 14 22:23:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151127 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6248857ljp; Wed, 14 Nov 2018 14:24:28 -0800 (PST) X-Google-Smtp-Source: AJdET5f9e6iMAz3wgo+0iFXIHISbDMJkekPLj6rdoXj06IHSVTSsOqCNGx5u8qhx/1+ReGfB6KLL X-Received: by 2002:a17:902:24e7:: with SMTP id l36-v6mr3677187plg.243.1542234268308; Wed, 14 Nov 2018 14:24:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542234268; cv=none; d=google.com; s=arc-20160816; b=tmtqqxrsxX1I0/f5yfzBJd4SG0zYetFEBB4JPNe6XbItXW0VcEAFfQn7tlnVYkaR3N TRSnXbxRjHqczI5AGsTGmmva+/SbSWMIdixynh+O4j5ZmthSgXw3S8vOofhR7ce/DoNN /q+ZBDpM7PL6xKWT3RijDs0iOI9qIJFsvZsTwxe9nkzj23fYrj8P3PtbbqBaETN2iX6U n2nconwmgY+J688xdMkCdO1k7b2CezWrHNG416b81k0bncP3TIDCa9NshOSJasjqZH6T eYDLZLnRDoONv1xCJ0TuZ8OATleeWUQFADY/a+RXYRrYUXe2UOshEYVPsWVLm3DMITfi 5YVA== 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=vvIFYYdpiHp6tS6CCU+am+XPC2kUBg4j9g7JzQu9tPuoUxAM2cUTTBG2Vag0ezpPcA yroDGdQPI0/iPAznlZuOcNapnrdK1e02Zv5HrgEpLc/o9mRrZ1G1r5f0PncAD11MBF01 N7d2dTMV8PoQjBrvrSw07W5t+S8IKwPMIq9xKw0GVEyZta47cz6fqri4mzJjNOCab0hw ZVuhAilSrff3x8KLYFe27IXQQNrCEiP3fYhJE8KdJt9uC1MM/qo4j4Uh9g+Z8n6qnX9l R8ABk5yzHGWIHYriPf8DZru+a5VoABKNdtNc0zoa6e51vKYCOjJYZMJCH6cSTrDgHF5g QXgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kW3P0lt6; 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 w13-v6si24845095plq.198.2018.11.14.14.24.28; Wed, 14 Nov 2018 14:24:28 -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=kW3P0lt6; 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 S2388350AbeKOI3a (ORCPT + 32 others); Thu, 15 Nov 2018 03:29:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:36428 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726506AbeKOI33 (ORCPT ); Thu, 15 Nov 2018 03:29:29 -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 58BB422527; Wed, 14 Nov 2018 22:24:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542234265; bh=ySSQ3pcYerKH4OiBJKAgte5YYA9tT0QRHveHFw8BwvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kW3P0lt6rbdPsGurEEWhHwFo3w4TXHJs9RL6BX/+u9fm06af/9Iz/y6AjPVj5yaSa XMqORQHERk7voSYyPCKlCdOjJyWa72hghqDvyWLrxOeTtrKKo7o5AreQabsPS7N5Wm o+enpAAFzDbTDrNfuMMLbk+jTCbQH19EMws8+o0M= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jeremy Linton , Catalin Marinas , Sasha Levin Subject: [PATCH AUTOSEL 4.18 30/59] lib/raid6: Fix arm64 test build Date: Wed, 14 Nov 2018 17:23:02 -0500 Message-Id: <20181114222335.99339-30-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181114222335.99339-1-sashal@kernel.org> References: <20181114222335.99339-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' |\