summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/fixmap.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-10-23 13:19:54 +0200
committerJiri Kosina <jkosina@suse.cz>2018-10-23 13:19:54 +0200
commita600ffe6ec609b0600ec590236f97f8d430e0984 (patch)
tree57432877c74c80ab470d7b655a2e18a6b5168ee5 /arch/x86/include/asm/fixmap.h
parentd19031d32cd77b2878a006040e0f8e4183ca59ef (diff)
parent23e542e5ba5e4298a1475f94750317ec1662ba21 (diff)
Merge branch 'for-4.20/google' into for-linus
Whisker device specific fixes to hid-google driver
Diffstat (limited to 'arch/x86/include/asm/fixmap.h')
-rw-r--r--arch/x86/include/asm/fixmap.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
index e203169931c7..6390bd8c141b 100644
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
@@ -14,6 +14,16 @@
#ifndef _ASM_X86_FIXMAP_H
#define _ASM_X86_FIXMAP_H
+/*
+ * Exposed to assembly code for setting up initial page tables. Cannot be
+ * calculated in assembly code (fixmap entries are an enum), but is sanity
+ * checked in the actual fixmap C code to make sure that the fixmap is
+ * covered fully.
+ */
+#define FIXMAP_PMD_NUM 2
+/* fixmap starts downwards from the 507th entry in level2_fixmap_pgt */
+#define FIXMAP_PMD_TOP 507
+
#ifndef __ASSEMBLY__
#include <linux/kernel.h>
#include <asm/acpi.h>