diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mm/mmap.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 696cf3c61e0f..f85200a63a8b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -3,6 +3,7 @@ config ARM | |||
| 3 | default y | 3 | default y |
| 4 | select ARCH_BINFMT_ELF_RANDOMIZE_PIE | 4 | select ARCH_BINFMT_ELF_RANDOMIZE_PIE |
| 5 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE | 5 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE |
| 6 | select ARCH_HAS_ELF_RANDOMIZE | ||
| 6 | select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST | 7 | select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST |
| 7 | select ARCH_HAVE_CUSTOM_GPIO_H | 8 | select ARCH_HAVE_CUSTOM_GPIO_H |
| 8 | select ARCH_HAS_GCOV_PROFILE_ALL | 9 | select ARCH_HAS_GCOV_PROFILE_ALL |
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c index 15a8160096b3..407dc786583a 100644 --- a/arch/arm/mm/mmap.c +++ b/arch/arm/mm/mmap.c | |||
| @@ -169,7 +169,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, | |||
| 169 | return addr; | 169 | return addr; |
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | static unsigned long mmap_rnd(void) | 172 | unsigned long arch_mmap_rnd(void) |
| 173 | { | 173 | { |
| 174 | unsigned long rnd; | 174 | unsigned long rnd; |
| 175 | 175 | ||
| @@ -184,7 +184,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm) | |||
| 184 | unsigned long random_factor = 0UL; | 184 | unsigned long random_factor = 0UL; |
| 185 | 185 | ||
| 186 | if (current->flags & PF_RANDOMIZE) | 186 | if (current->flags & PF_RANDOMIZE) |
| 187 | random_factor = mmap_rnd(); | 187 | random_factor = arch_mmap_rnd(); |
| 188 | 188 | ||
| 189 | if (mmap_is_legacy()) { | 189 | if (mmap_is_legacy()) { |
| 190 | mm->mmap_base = TASK_UNMAPPED_BASE + random_factor; | 190 | mm->mmap_base = TASK_UNMAPPED_BASE + random_factor; |
