From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753082AbdHUJn3 (ORCPT ); Mon, 21 Aug 2017 05:43:29 -0400 Received: from terminus.zytor.com ([65.50.211.136]:35037 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751895AbdHUJn2 (ORCPT ); Mon, 21 Aug 2017 05:43:28 -0400 Date: Mon, 21 Aug 2017 02:39:47 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: tglx@linutronix.de, luto@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, mingo@kernel.org, bp@suse.de, peterz@infradead.org, hpa@zytor.com, thomas.lendacky@amd.com Reply-To: thomas.lendacky@amd.com, hpa@zytor.com, peterz@infradead.org, torvalds@linux-foundation.org, mingo@kernel.org, bp@suse.de, linux-kernel@vger.kernel.org, tglx@linutronix.de, luto@kernel.org In-Reply-To: <20170821080651.4527-1-bp@alien8.de> References: <20170821080651.4527-1-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/CPU: Align CR3 defines Git-Commit-ID: d6c8103b0265d8db30e20e948a4f06382bbdaea7 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d6c8103b0265d8db30e20e948a4f06382bbdaea7 Gitweb: http://git.kernel.org/tip/d6c8103b0265d8db30e20e948a4f06382bbdaea7 Author: Borislav Petkov AuthorDate: Mon, 21 Aug 2017 10:06:51 +0200 Committer: Ingo Molnar CommitDate: Mon, 21 Aug 2017 11:35:50 +0200 x86/CPU: Align CR3 defines Align them vertically for better readability and use BIT_ULL() macro. No functionality change. Signed-off-by: Borislav Petkov Cc: Andy Lutomirski Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Tom Lendacky Link: http://lkml.kernel.org/r/20170821080651.4527-1-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/include/asm/processor-flags.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/processor-flags.h b/arch/x86/include/asm/processor-flags.h index 8a6d89f..dc723b6 100644 --- a/arch/x86/include/asm/processor-flags.h +++ b/arch/x86/include/asm/processor-flags.h @@ -34,17 +34,17 @@ */ #ifdef CONFIG_X86_64 /* Mask off the address space ID and SME encryption bits. */ -#define CR3_ADDR_MASK __sme_clr(0x7FFFFFFFFFFFF000ull) -#define CR3_PCID_MASK 0xFFFull -#define CR3_NOFLUSH (1UL << 63) +#define CR3_ADDR_MASK __sme_clr(0x7FFFFFFFFFFFF000ull) +#define CR3_PCID_MASK 0xFFFull +#define CR3_NOFLUSH BIT_ULL(63) #else /* * CR3_ADDR_MASK needs at least bits 31:5 set on PAE systems, and we save * a tiny bit of code size by setting all the bits. */ -#define CR3_ADDR_MASK 0xFFFFFFFFull -#define CR3_PCID_MASK 0ull -#define CR3_NOFLUSH 0 +#define CR3_ADDR_MASK 0xFFFFFFFFull +#define CR3_PCID_MASK 0ull +#define CR3_NOFLUSH 0 #endif #endif /* _ASM_X86_PROCESSOR_FLAGS_H */