---

yaml --- r: 365411 b: refs/heads/master c: 104ad3b h: refs/heads/master i: 365409: 44ae43b 365407: a7bd890 v: v3
git-mirror · Apr 29, 2013 · 23d80e2 · 23d80e2
1 parent 029afb6
commit 23d80e2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ee8630e02be6dd89926ca0fbc21af68b23dc087
+refs/heads/master: 104ad3b32d7a71941c8ab2dee78eea38e8a23309
diff --git a/trunk/arch/arm/include/asm/pgtable.h b/trunk/arch/arm/include/asm/pgtable.h
@@ -60,6 +60,15 @@ extern void __pgd_error(const char *file, int line, pgd_t);
  */
 #define FIRST_USER_ADDRESS	PAGE_SIZE
 
+/*
+ * Use TASK_SIZE as the ceiling argument for free_pgtables() and
+ * free_pgd_range() to avoid freeing the modules pmd when LPAE is enabled (pmd
+ * page shared between user and kernel).
+ */
+#ifdef CONFIG_ARM_LPAE
+#define USER_PGTABLES_CEILING	TASK_SIZE
+#endif
+
 /*
  * The pgprot_* and protection_map entries will be fixed up in runtime
  * to include the cachable and bufferable bits based on memory policy,