summaryrefslogtreecommitdiff
path: root/arch/arm/kernel/module.c
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2011-11-11 15:29:25 -0800
committerJohn Stultz <john.stultz@linaro.org>2011-11-11 15:29:25 -0800
commitc3e5127312f97482a6a09c0df602c726675eff5b (patch)
tree9082d8201a1daac5ff019ef50322d551711eb250 /arch/arm/kernel/module.c
parent5e537f041bd05cddee0d2a2fb3013ee642064cc6 (diff)
parentf171dfebbdf1de4b6ca267285739e190f95f84cc (diff)
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebaselinux-linaro-3.1-2011.11-0-android-0
Diffstat (limited to 'arch/arm/kernel/module.c')
-rw-r--r--arch/arm/kernel/module.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
index cc2020c2c70..1e9be5d25e5 100644
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
@@ -33,7 +33,7 @@
* recompiling the whole kernel when CONFIG_XIP_KERNEL is turned on/off.
*/
#undef MODULES_VADDR
-#define MODULES_VADDR (((unsigned long)_etext + ~PGDIR_MASK) & PGDIR_MASK)
+#define MODULES_VADDR (((unsigned long)_etext + ~PMD_MASK) & PMD_MASK)
#endif
#ifdef CONFIG_MMU