From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEF84C04E84 for ; Wed, 15 May 2019 12:15:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A444F20843 for ; Wed, 15 May 2019 12:15:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557922534; bh=sJY81SqPFx9uVWpwlWxULDpYpvZNuIz5WuqgmFvI8MM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qWEQ95nfHIaq9HlVEFdMgqcvWRzgLr0dlAgKcv9lgdoaHhAuEreFfkRzPOGPpJ8Uy nz4wDRSDFx/BMlAS6lpivCdRs9LoeBe3YD9Bitk+c5fBcd6Gzm/GlDzMnhwl7oEkHZ oD4mlVTmZrVu7JGv6Ij4V6B1/cQo8oZ3LOKQVqos= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727406AbfEOLD3 (ORCPT ); Wed, 15 May 2019 07:03:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:32812 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727264AbfEOLD2 (ORCPT ); Wed, 15 May 2019 07:03:28 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BB72C20881; Wed, 15 May 2019 11:03:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918208; bh=sJY81SqPFx9uVWpwlWxULDpYpvZNuIz5WuqgmFvI8MM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G7246WlpTVg+56ciS+Ndi6RnaGLSOJDNW57JTb21zonqD2gcZKtz1wZjNhesagd72 uaApk30H6b4Ms9tgBkGLlikH7jdgQVzlgwiN5lo7G3Zb2QXCMkQS2F3tGMul+7mPSH DLbUN777B1waY/zMEPJgjjUSQdB7uJw6s9u7TCCk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Diana Craciun , Michael Ellerman Subject: [PATCH 4.4 046/266] powerpc/64: Make stf barrier PPC_BOOK3S_64 specific. Date: Wed, 15 May 2019 12:52:33 +0200 Message-Id: <20190515090724.023961338@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090722.696531131@linuxfoundation.org> References: <20190515090722.696531131@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Diana Craciun commit 6453b532f2c8856a80381e6b9a1f5ea2f12294df upstream. NXP Book3E platforms are not vulnerable to speculative store bypass, so make the mitigations PPC_BOOK3S_64 specific. Signed-off-by: Diana Craciun Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/kernel/security.c | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/powerpc/kernel/security.c +++ b/arch/powerpc/kernel/security.c @@ -177,6 +177,7 @@ ssize_t cpu_show_spectre_v2(struct devic return s.len; } +#ifdef CONFIG_PPC_BOOK3S_64 /* * Store-forwarding barrier support. */ @@ -322,3 +323,4 @@ static __init int stf_barrier_debugfs_in } device_initcall(stf_barrier_debugfs_init); #endif /* CONFIG_DEBUG_FS */ +#endif /* CONFIG_PPC_BOOK3S_64 */