diff options
| author | Borislav Petkov <bp@suse.de> | 2017-08-21 10:06:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-21 11:35:50 +0200 |
| commit | d6c8103b0265d8db30e20e948a4f06382bbdaea7 (patch) | |
| tree | c31b5c5354c7c66af281cd662b937fc2f62a1475 /arch/x86/include/asm/processor-flags.h | |
| parent | x86/mm, mm/hwpoison: Clear PRESENT bit for kernel 1:1 mappings of poison pages (diff) | |
| download | linux-d6c8103b0265d8db30e20e948a4f06382bbdaea7.tar.xz linux-d6c8103b0265d8db30e20e948a4f06382bbdaea7.zip | |
x86/CPU: Align CR3 defines
Align them vertically for better readability and use BIT_ULL() macro.
No functionality change.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Link: http://lkml.kernel.org/r/20170821080651.4527-1-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/processor-flags.h')
| -rw-r--r-- | arch/x86/include/asm/processor-flags.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/include/asm/processor-flags.h b/arch/x86/include/asm/processor-flags.h index 8a6d89fc9a79..dc723b64acf0 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 */ |