From patchwork Thu Aug 28 20:46:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 384024 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 712681400A0; Fri, 29 Aug 2014 06:47:32 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XN6bM-0000BQ-Ba; Thu, 28 Aug 2014 20:47:24 +0000 Received: from complete.lackof.org ([198.49.126.79]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XN6bH-0000Av-BO for kernel-team@lists.ubuntu.com; Thu, 28 Aug 2014 20:47:19 +0000 Received: from localhost (c-50-170-238-85.hsd1.co.comcast.net [50.170.238.85]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client did not present a certificate) by complete.lackof.org (Postfix) with ESMTPSA id 6862633E001C for ; Thu, 28 Aug 2014 14:47:15 -0600 (MDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH] arm64/crypto: fix makefile rule for aes-glue-%.o Date: Thu, 28 Aug 2014 14:46:54 -0600 Message-Id: <1409258814-16847-1-git-send-email-dann.frazier@canonical.com> X-Mailer: git-send-email 2.1.0 X-Virus-Scanned: clamav-milter 0.98.1 at complete.lackof.org X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on complete.lackof.org X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com This fixes the following build failure when building with CONFIG_MODVERSIONS enabled: CC [M] arch/arm64/crypto/aes-glue-ce.o ld: cannot find arch/arm64/crypto/aes-glue-ce.o: No such file or directory make[1]: *** [arch/arm64/crypto/aes-ce-blk.o] Error 1 make: *** [arch/arm64/crypto] Error 2 The $(obj)/aes-glue-%.o rule only creates $(obj)/.tmp_aes-glue-ce.o, it should use if_changed_rule instead of if_changed_dep. Signed-off-by: Andreas Schwab [ardb: mention CONFIG_MODVERSIONS in commit log] Signed-off-by: Ard Biesheuvel Signed-off-by: Catalin Marinas (cherry picked from upstream 7c2105fbe9658d6cee18751568e29579bb58bfec) [replacing non-upstream fix that was added in 5226d69] Signed-off-by: dann frazier --- arch/arm64/crypto/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/crypto/Makefile b/arch/arm64/crypto/Makefile index eea5315..a3f935f 100644 --- a/arch/arm64/crypto/Makefile +++ b/arch/arm64/crypto/Makefile @@ -35,5 +35,4 @@ AFLAGS_aes-neon.o := -DINTERLEAVE=4 CFLAGS_aes-glue-ce.o := -DUSE_V8_CRYPTO_EXTENSIONS $(obj)/aes-glue-%.o: $(src)/aes-glue.c FORCE - $(call if_changed_dep,cc_o_c) - mv -v $(obj)/.tmp_aes-glue-$*.o $(obj)/aes-glue-$*.o + $(call if_changed_rule,cc_o_c)