projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (patches from Andrew)
[cascardo/linux.git]
/
arch
/
arm
/
kernel
/
process.c
diff --git
a/arch/arm/kernel/process.c
b/arch/arm/kernel/process.c
index
612eb53
..
91d2d5b
100644
(file)
--- a/
arch/arm/kernel/process.c
+++ b/
arch/arm/kernel/process.c
@@
-318,8
+318,7
@@
unsigned long get_wchan(struct task_struct *p)
unsigned long arch_randomize_brk(struct mm_struct *mm)
{
- unsigned long range_end = mm->brk + 0x02000000;
- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+ return randomize_page(mm->brk, 0x02000000);
}
#ifdef CONFIG_MMU