diff options
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/Kconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/mm/mmap.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 91ad76f30d18..fc5fffbb331b 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -89,6 +89,7 @@ config PPC | |||
89 | select ARCH_MIGHT_HAVE_PC_SERIO | 89 | select ARCH_MIGHT_HAVE_PC_SERIO |
90 | select BINFMT_ELF | 90 | select BINFMT_ELF |
91 | select ARCH_BINFMT_ELF_RANDOMIZE_PIE | 91 | select ARCH_BINFMT_ELF_RANDOMIZE_PIE |
92 | select ARCH_HAS_ELF_RANDOMIZE | ||
92 | select OF | 93 | select OF |
93 | select OF_EARLY_FLATTREE | 94 | select OF_EARLY_FLATTREE |
94 | select OF_RESERVED_MEM | 95 | select OF_RESERVED_MEM |
diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c index 1ad2299d795d..0f0502e12f6c 100644 --- a/arch/powerpc/mm/mmap.c +++ b/arch/powerpc/mm/mmap.c | |||
@@ -53,7 +53,7 @@ static inline int mmap_is_legacy(void) | |||
53 | return sysctl_legacy_va_layout; | 53 | return sysctl_legacy_va_layout; |
54 | } | 54 | } |
55 | 55 | ||
56 | static unsigned long mmap_rnd(void) | 56 | unsigned long arch_mmap_rnd(void) |
57 | { | 57 | { |
58 | unsigned long rnd; | 58 | unsigned long rnd; |
59 | 59 | ||
@@ -87,7 +87,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm) | |||
87 | unsigned long random_factor = 0UL; | 87 | unsigned long random_factor = 0UL; |
88 | 88 | ||
89 | if (current->flags & PF_RANDOMIZE) | 89 | if (current->flags & PF_RANDOMIZE) |
90 | random_factor = mmap_rnd(); | 90 | random_factor = arch_mmap_rnd(); |
91 | 91 | ||
92 | /* | 92 | /* |
93 | * Fall back to the standard layout if the personality | 93 | * Fall back to the standard layout if the personality |