tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mm: x86 pgtable: drop unneeded preprocessor ifdef

_PAGE_BIT_FILE (bit 6) is always less than _PAGE_BIT_PROTNONE (bit 8), so
drop redundant #ifdef.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Steven Noonan <steven@uplinklabs.net>
Cc: Rik van Riel <riel@redhat.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Cyrill Gorcunov and committed by
Linus Torvalds 2373eaec fa5bb209

-18
-10
arch/x86/include/asm/pgtable-2level.h
··· 115 115 */ 116 116 #define PTE_FILE_MAX_BITS 29 117 117 #define PTE_FILE_SHIFT1 (_PAGE_BIT_PRESENT + 1) 118 - #if _PAGE_BIT_FILE < _PAGE_BIT_PROTNONE 119 118 #define PTE_FILE_SHIFT2 (_PAGE_BIT_FILE + 1) 120 119 #define PTE_FILE_SHIFT3 (_PAGE_BIT_PROTNONE + 1) 121 - #else 122 - #define PTE_FILE_SHIFT2 (_PAGE_BIT_PROTNONE + 1) 123 - #define PTE_FILE_SHIFT3 (_PAGE_BIT_FILE + 1) 124 - #endif 125 120 #define PTE_FILE_BITS1 (PTE_FILE_SHIFT2 - PTE_FILE_SHIFT1 - 1) 126 121 #define PTE_FILE_BITS2 (PTE_FILE_SHIFT3 - PTE_FILE_SHIFT2 - 1) 127 122 ··· 148 153 #endif /* CONFIG_MEM_SOFT_DIRTY */ 149 154 150 155 /* Encode and de-code a swap entry */ 151 - #if _PAGE_BIT_FILE < _PAGE_BIT_PROTNONE 152 156 #define SWP_TYPE_BITS (_PAGE_BIT_FILE - _PAGE_BIT_PRESENT - 1) 153 157 #define SWP_OFFSET_SHIFT (_PAGE_BIT_PROTNONE + 1) 154 - #else 155 - #define SWP_TYPE_BITS (_PAGE_BIT_PROTNONE - _PAGE_BIT_PRESENT - 1) 156 - #define SWP_OFFSET_SHIFT (_PAGE_BIT_FILE + 1) 157 - #endif 158 158 159 159 #define MAX_SWAPFILES_CHECK() BUILD_BUG_ON(MAX_SWAPFILES_SHIFT > SWP_TYPE_BITS) 160 160
-8
arch/x86/include/asm/pgtable_64.h
··· 143 143 #define pte_unmap(pte) ((void)(pte))/* NOP */ 144 144 145 145 /* Encode and de-code a swap entry */ 146 - #if _PAGE_BIT_FILE < _PAGE_BIT_PROTNONE 147 146 #define SWP_TYPE_BITS (_PAGE_BIT_FILE - _PAGE_BIT_PRESENT - 1) 148 147 #ifdef CONFIG_NUMA_BALANCING 149 148 /* Automatic NUMA balancing needs to be distinguishable from swap entries */ 150 149 #define SWP_OFFSET_SHIFT (_PAGE_BIT_PROTNONE + 2) 151 150 #else 152 151 #define SWP_OFFSET_SHIFT (_PAGE_BIT_PROTNONE + 1) 153 - #endif 154 - #else 155 - #ifdef CONFIG_NUMA_BALANCING 156 - #error Incompatible format for automatic NUMA balancing 157 - #endif 158 - #define SWP_TYPE_BITS (_PAGE_BIT_PROTNONE - _PAGE_BIT_PRESENT - 1) 159 - #define SWP_OFFSET_SHIFT (_PAGE_BIT_FILE + 1) 160 152 #endif 161 153 162 154 #define MAX_SWAPFILES_CHECK() BUILD_BUG_ON(MAX_SWAPFILES_SHIFT > SWP_TYPE_BITS)