mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge branch 'linus' into perfcounters/core
Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
the latest upstream fixes.
Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
commit
e7fd5d4b3d
1883 changed files with 53577 additions and 55251 deletions
|
|
@ -1579,7 +1579,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
|
|||
* Overcommit.. This must be the final test, as it will
|
||||
* update security statistics.
|
||||
*/
|
||||
if (security_vm_enough_memory(grow))
|
||||
if (security_vm_enough_memory_mm(mm, grow))
|
||||
return -ENOMEM;
|
||||
|
||||
/* Ok, everything looks good - let it rip */
|
||||
|
|
|
|||
Loading…
Reference in a new issue