projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
/spare/repo/netdev-2.6 branch 'ieee80211'
[firefly-linux-kernel-4.4.55.git]
/
mm
/
nommu.c
diff --git
a/mm/nommu.c
b/mm/nommu.c
index c53e9c8f6b4adc98ac9fe69b1bc3526bba1baaa5..fd4e8df0f02df979bb2a2de5a891e35f82754a7d 100644
(file)
--- a/
mm/nommu.c
+++ b/
mm/nommu.c
@@
-1067,7
+1067,7
@@
unsigned long arch_get_unmapped_area(struct file *file, unsigned long addr,
return -ENOMEM;
}
return -ENOMEM;
}
-void arch_unmap_area(struct
vm_area_struct *area
)
+void arch_unmap_area(struct
mm_struct *mm, unsigned long addr
)
{
}
{
}
@@
-1167,7
+1167,11
@@
int __vm_enough_memory(long pages, int cap_sys_admin)
leave 3% of the size of this process for other processes */
allowed -= current->mm->total_vm / 32;
leave 3% of the size of this process for other processes */
allowed -= current->mm->total_vm / 32;
- if (atomic_read(&vm_committed_space) < allowed)
+ /*
+ * cast `allowed' as a signed long because vm_committed_space
+ * sometimes has a negative value
+ */
+ if (atomic_read(&vm_committed_space) < (long)allowed)
return 0;
vm_unacct_memory(pages);
return 0;
vm_unacct_memory(pages);