Merge tag 'media/v4.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[sfrench/cifs-2.6.git] / arch / x86 / include / asm / pgtable_32_types.h

diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
index ce245b0cdfcaa42bd932a387bbb189ee7349bfef..0777e18a1d2381c134b95d01efce0931ae8f9bd1 100644 (file)
--- a/arch/x86/include/asm/pgtable_32_types.h
+++ b/arch/x86/include/asm/pgtable_32_types.h
@@ -44,8 +44,9 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
  */
 #define CPU_ENTRY_AREA_PAGES   (NR_CPUS * 40)
 
-#define CPU_ENTRY_AREA_BASE                            \
-       ((FIXADDR_START - PAGE_SIZE * (CPU_ENTRY_AREA_PAGES + 1)) & PMD_MASK)
+#define CPU_ENTRY_AREA_BASE                                            \
+       ((FIXADDR_TOT_START - PAGE_SIZE * (CPU_ENTRY_AREA_PAGES + 1))   \
+        & PMD_MASK)
 
 #define PKMAP_BASE             \
        ((CPU_ENTRY_AREA_BASE - PAGE_SIZE) & PMD_MASK)