From patchwork Thu Dec 14 14:02:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 121964 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp6846140qgn; Thu, 14 Dec 2017 06:04:36 -0800 (PST) X-Google-Smtp-Source: ACJfBouTOETelml8Gv9NPHYknDsdStw5F4AMLkG0X1KF8JQIq99p3f6aaCtmflVVSBCJfn21gkVC X-Received: by 10.98.28.5 with SMTP id c5mr9638673pfc.154.1513260276449; Thu, 14 Dec 2017 06:04:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513260276; cv=none; d=google.com; s=arc-20160816; b=a0UqIMpmWmzj0hpe/HdCP2XEHMnUpeQlnbFjUW1kR6zFA/eVrtMeh+6t8suApJkfhZ vWz7ZnghJx3yEPttDv2siqzv3xbtkLQgotkgbpTt5DFnOXiaMrFBICmUOjs+wlHapmjB LYK7U4Epk3vPJeKzvNHy2tR9rKe7bRW3r1Q0FuiX+BitwexnWSJzwLpr5wmGqr2KXMm0 e7QELvRQ67HMBQePpNLWioNADjmNQYIIA/g2x/VKBV9sIsN9HS6zH/5sg7zK+6jUCv+R RFt11U12HYMWN5kSEZ5SztzD2g349vgCdTnFYfTxYP1KAXHBGgiVnWu2YT5dkxgi5HDe Z/KQ== 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:arc-authentication-results; bh=xkPrFK/EO/+2f2yylc846PSvk4MuOsBlrrapaAeAtXI=; b=sQtEEaR10vh4kZ9wa/vQ7cIlEVIWLBClcvAePgsRQtD5MeDX75umh3DA1KPeNBWMjS s6lBjMOnheFVJIRPSLZKVmBbNT2hu5khoND9BB4YBRLjakOxnd0kYchs8gAfBY9VKlL4 d24QAy0PqhbTbX2kxvjvbKMcky/84I8iejGz+TaT0dJlmSgK+OwhKmcN50hdJmPJQ9d5 aCiQ/NQ8tcyQ1UpAJPw78RsP/fRFOL+9RyGP/m/0RCNfobYlp6gGBONbwimIuAXIuqrU gTG0SRoUZgy0sOlK+ou3l6LLKtn9dWlhNS2GD13VEiao/16zRoG+n3GBazKhsytL6jNA Z0fQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t27si2951488pgn.539.2017.12.14.06.04.35; Thu, 14 Dec 2017 06:04:36 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752498AbdLNOEc (ORCPT + 20 others); Thu, 14 Dec 2017 09:04:32 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:42230 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753050AbdLNODq (ORCPT ); Thu, 14 Dec 2017 09:03:46 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C75BF1435; Thu, 14 Dec 2017 06:03:45 -0800 (PST) Received: from sugar.kfn.arm.com (unknown [10.45.48.196]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CB91B3F246; Thu, 14 Dec 2017 06:03:43 -0800 (PST) From: Gilad Ben-Yossef To: Greg Kroah-Hartman Cc: Ofir Drang , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, driverdev-devel@linuxdriverproject.org, devel@driverdev.osuosl.org Subject: [PATCH 09/10] staging: ccree: fix fips event irq handling build Date: Thu, 14 Dec 2017 14:02:46 +0000 Message-Id: <1513260170-26346-10-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513260170-26346-1-git-send-email-gilad@benyossef.com> References: <1513260170-26346-1-git-send-email-gilad@benyossef.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When moving from internal for kernel FIPS infrastructure the FIPS event irq handling code was left with the old ifdef by mistake. Fix it. Fixes: b7e607bf33a2 ("staging: ccree: move FIPS support to kernel infrastructure") Cc: stable@vger.kernel.org Signed-off-by: Gilad Ben-Yossef --- drivers/staging/ccree/ssi_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/staging/ccree/ssi_driver.c b/drivers/staging/ccree/ssi_driver.c index df6d415..56b5d45 100644 --- a/drivers/staging/ccree/ssi_driver.c +++ b/drivers/staging/ccree/ssi_driver.c @@ -123,7 +123,7 @@ static irqreturn_t cc_isr(int irq, void *dev_id) irr &= ~CC_COMP_IRQ_MASK; complete_request(drvdata); } -#ifdef CC_SUPPORT_FIPS +#ifdef CONFIG_CRYPTO_FIPS /* TEE FIPS interrupt */ if (irr & CC_GPR0_IRQ_MASK) { /* Mask interrupt - will be unmasked in Deferred service