From 23d80e24953f530d8d76fe6cd04a5531e7cc7254 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Mon, 29 Apr 2013 15:07:45 -0700 Subject: [PATCH] --- yaml --- r: 365411 b: refs/heads/master c: 104ad3b32d7a71941c8ab2dee78eea38e8a23309 h: refs/heads/master i: 365409: 44ae43b48139df1b36ca613a3877c7f2f2c6f1e6 365407: a7bd890e666c93d68652f69a5dd2232493c75cc7 v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/pgtable.h | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a3f902cd7499..a36323df5cf9 100644 --- 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 index 80d6fc4dbe4a..9bcd262a9008 100644 --- 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,