From patchwork Wed Nov 14 22:25:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151134 Delivered-To: patch@linaro.org Received: by 2002:aa7:da0f:0:0:0:0:0 with SMTP id r15csp6702588eds; Wed, 14 Nov 2018 14:32:06 -0800 (PST) X-Google-Smtp-Source: AJdET5fm/1/UmIXSWCiD3H2/oMIzrCSrdyl+uPtGyjHTFDC5QSv5uOG7FcgtSuSu9AQfrQBuZRf8 X-Received: by 2002:a17:902:9f8c:: with SMTP id g12-v6mr3095718plq.127.1542234726763; Wed, 14 Nov 2018 14:32:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542234726; cv=none; d=google.com; s=arc-20160816; b=enXJwSIH0Uo0yxm4FpQTumslKk9aVLrtl03Rkq/TNozU2BKJb7LTB8HMluHWcKDfU3 Gi1FB/hD6iyO5PAVcgiLAYHvzfFZQO9+JpHp2tLxJBSzMsyctjSPnuKCcAmq5pkEOMHT 3J+9Pl4havv36dS5MWA/W8URWxngFKWkmgCsk7DYF70KzzyyK4ZvRSVSSHftwU6fZA7y 0HYXc+MevvkP3ix/oA4olw6wAjPv22Ys4jcu/98wv/OFCCYmmb22md3s6Jg+r/I6Gcnw /SHUunXNSz3GoCz2X9rULLqvKo4wsvXeWRaDY6nEHYB+qXue+P99iIgssFUK68G+l+Os EG8g== 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=wGKZ7F5avGaC65WLPRy/Yk3v5vuaQQDN5gK4RqoaQzQ=; b=LxydkvVc9kTrR9SAP7iguJwE0WWMBU+y+kgJtT5ljE/aJ+d+Q2Ni0jDMOnD3dr1qxv TKGxoVDuTTRYtAeV9QISHAs1guoJcawoczt4J29WbOS69SZ847BlafKSd2ReT6rICHLo LsA9HPuLxmc59ANuYl/ZpKQJRiSaRavi/YG2Tpwdp8t8t87NbAdjf7CpcX60qd8CHmos 4eCwXdYUKxRkJ/FFwu6/yiSJr2Qajg4eop1KXpLvmm90yr1cPCf6fAt7oBYYmLDZmRJW N3gbjKlWpq/BU0jXStC6J+ekGCOVQdJY7GiGmgQ1627e+voDo3i7v6/l+ujsjsC9u9e+ vM5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gJ7BL247; 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 x2-v6si24788222plv.413.2018.11.14.14.32.06; Wed, 14 Nov 2018 14:32:06 -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=gJ7BL247; 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 S2388569AbeKOIhK (ORCPT + 32 others); Thu, 15 Nov 2018 03:37:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:37930 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728308AbeKOIaq (ORCPT ); Thu, 15 Nov 2018 03:30:46 -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 B832222544; Wed, 14 Nov 2018 22:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542234341; bh=6jmCeZQAb6F97TZbfELEkrwfVzp8kyyFM0LgbgnIT8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gJ7BL247faWYoMbzzAOweieleP1J8sjV8dK4OUfvzePq5PUiPDf+FfVTs7H+SW35D zWjG6F+chs3Tosa8Hg4j0qJ11a+kNBdNF4pgWUvHE5w2CApTcJS3X+IRYce9hxsqUx KmUihcY5/RVZG6hJWLvQSlB2LFtflz/I83JZc3nw= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jeremy Linton , Catalin Marinas , Sasha Levin Subject: [PATCH AUTOSEL 4.14 15/27] lib/raid6: Fix arm64 test build Date: Wed, 14 Nov 2018 17:25:04 -0500 Message-Id: <20181114222520.99926-15-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181114222520.99926-1-sashal@kernel.org> References: <20181114222520.99926-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 be1010bdc435..565a77220fae 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' |\