Received: by 10.223.185.116 with SMTP id b49csp1033590wrg; Fri, 23 Feb 2018 10:42:01 -0800 (PST) X-Google-Smtp-Source: AH8x224NwpGal15Sg0hbvzQEWZLE+UEpQOWL8zOMqhDbYQeJ4WeDtmgts9BJhhBmfdxq1/Wn3j96 X-Received: by 2002:a17:902:461:: with SMTP id 88-v6mr2559769ple.88.1519411321105; Fri, 23 Feb 2018 10:42:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519411321; cv=none; d=google.com; s=arc-20160816; b=BCf3Z21KQl12lmwqLp3lVYto/zR4YUAyuDOGOnPOEb4u6HSaE+2AVGt3N2O32jNvks eQJkc3RoyP+chLADYVEtZH48oWF7SFgAwi7aG+QkpGPjxAH64TjYM47HS7DwS3blmYlk zIgm+fhjul0u8MCC9ebVtWxjT2NVIVYF8M7PFqCLkobDOtfb6n0WKgjuYFdhDfUSE6li XjyQ5zR/2lkBZVsUCyvoeHcqV5L4DTg1SQHA/abTBEUd9zJhE5PlvwGmkk2f4c7L/bwI yXigPGgHHF97VYq8JimjQYz/FYOIqubC4pHyfv+QtP8TCmpNJUUfLDxRX5YZSTLw2RTp zR4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=4WFgdWFGLrNGxpOYK1Z7MLw7pHkborYLWFR/FnHn+t0=; b=dQgnCKoLSw4uuB/SkXkLJJwlT6Emnc3j36Advtqo0742yAZqXXaa8A2rHWOQ8Ca1/2 K+PznwYNh1eToWYVhWsLERhMlkpx0qk8fW0gnChbOhYLy/kQaTjrrS27RnlCABGtol3x Z69HaIZyrMhxpKnyuhaPPPkQRlPG6tdZBEpgtXbE1/B6wXLhcgdYkVsiP7I1KrYOmrq8 WK82LVXNXOvKX05wYslFqruYpX9yWf9thZYWoAYV18OJPRlAvk+FZ12FlxzaG5zssLaL WK6HbFZ/Kg8pTEIRH42pfGiez5LwOTRU2DwamQmZmLZJLCAj6/siJ4RBVOZ9aDjCvh4W F9bg== 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 y72si2195037pfd.88.2018.02.23.10.41.46; Fri, 23 Feb 2018 10:42:01 -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 S932664AbeBWSkk (ORCPT + 99 others); Fri, 23 Feb 2018 13:40:40 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:40130 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932652AbeBWSkg (ORCPT ); Fri, 23 Feb 2018 13:40:36 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 978321093; Fri, 23 Feb 2018 18:40:35 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Borislav Petkov , Thomas Gleixner , riel@redhat.com, ak@linux.intel.com, peterz@infradead.org, David Woodhouse , jikos@kernel.org, luto@amacapital.net, dave.hansen@intel.com, torvalds@linux-foundation.org, keescook@google.com, Josh Poimboeuf , tim.c.chen@linux.intel.com, pjt@google.com, David Woodhouse , Jack Wang , gregkh@linux-foundation.org Subject: [PATCH 4.4 169/193] x86/nospec: Fix header guards names Date: Fri, 23 Feb 2018 19:26:42 +0100 Message-Id: <20180223170352.503332691@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170325.997716448@linuxfoundation.org> References: <20180223170325.997716448@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Borislav Petkov (cherry picked from commit 7a32fc51ca938e67974cbb9db31e1a43f98345a9) ... to adhere to the _ASM_X86_ naming scheme. No functional change. Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner Cc: riel@redhat.com Cc: ak@linux.intel.com Cc: peterz@infradead.org Cc: David Woodhouse Cc: jikos@kernel.org Cc: luto@amacapital.net Cc: dave.hansen@intel.com Cc: torvalds@linux-foundation.org Cc: keescook@google.com Cc: Josh Poimboeuf Cc: tim.c.chen@linux.intel.com Cc: gregkh@linux-foundation.org Cc: pjt@google.com Link: https://lkml.kernel.org/r/20180126121139.31959-3-bp@alien8.de Signed-off-by: David Woodhouse [cherry-pick to 4.4] Signed-off-by: Jack Wang Signed-off-by: Greg Kroah-Hartman --- arch/x86/include/asm/nospec-branch.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __NOSPEC_BRANCH_H__ -#define __NOSPEC_BRANCH_H__ +#ifndef _ASM_X86_NOSPEC_BRANCH_H_ +#define _ASM_X86_NOSPEC_BRANCH_H_ #include #include @@ -195,4 +195,4 @@ static inline void vmexit_fill_RSB(void) } #endif /* __ASSEMBLY__ */ -#endif /* __NOSPEC_BRANCH_H__ */ +#endif /* _ASM_X86_NOSPEC_BRANCH_H_ */