summaryrefslogtreecommitdiffstats
path: root/Documentation/arm
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2014-07-02 02:01:15 -0500
committerKees Cook <keescook@chromium.org>2014-10-16 14:38:52 -0700
commit836a24183273e9db1c092246bd8e306b297d9917 (patch)
tree6a6d69be0fd2110c6b66d3a595aa5de59bdee69e /Documentation/arm
parentb615bbbff1c4d6fcd13007e75d75f6510aeb3808 (diff)
downloadlinux-stable-836a24183273e9db1c092246bd8e306b297d9917.tar.gz
linux-stable-836a24183273e9db1c092246bd8e306b297d9917.tar.bz2
linux-stable-836a24183273e9db1c092246bd8e306b297d9917.zip
ARM: expand fixmap region to 3MB
With commit a05e54c103b0 ("ARM: 8031/2: change fixmap mapping region to support 32 CPUs"), the fixmap region was expanded to 2MB, but it precluded any other uses of the fixmap region. In order to support other uses the fixmap region needs to be expanded beyond 2MB. Fortunately, the adjacent 1MB range 0xffe00000-0xfff00000 is availabe. Remove fixmap_page_table ptr and lookup the page table via the virtual address so that the fixmap region can span more that one pmd. The 2nd pmd is already created since it is shared with the vector page. Signed-off-by: Rob Herring <robh@kernel.org> [kees: fixed CONFIG_DEBUG_HIGHMEM get_fixmap() calls] [kees: moved pte allocation outside of CONFIG_HIGHMEM] Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Nicolas Pitre <nico@linaro.org>
Diffstat (limited to 'Documentation/arm')
-rw-r--r--Documentation/arm/memory.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/arm/memory.txt b/Documentation/arm/memory.txt
index 38dc06d0a791..4178ebda6e66 100644
--- a/Documentation/arm/memory.txt
+++ b/Documentation/arm/memory.txt
@@ -41,7 +41,7 @@ fffe8000 fffeffff DTCM mapping area for platforms with
fffe0000 fffe7fff ITCM mapping area for platforms with
ITCM mounted inside the CPU.
-ffc00000 ffdfffff Fixmap mapping region. Addresses provided
+ffc00000 ffefffff Fixmap mapping region. Addresses provided
by fix_to_virt() will be located here.
fee00000 feffffff Mapping of PCI I/O space. This is a static