|
@@ -410,7 +410,7 @@ void __vma_link_rb(struct mm_struct *mm, struct vm_area_struct *vma,
|
|
|
rb_insert_color(&vma->vm_rb, &mm->mm_rb);
|
|
|
}
|
|
|
|
|
|
-static inline void __vma_link_file(struct vm_area_struct *vma)
|
|
|
+static void __vma_link_file(struct vm_area_struct *vma)
|
|
|
{
|
|
|
struct file * file;
|
|
|
|
|
@@ -1591,7 +1591,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
|
|
|
* vma is the last one with address > vma->vm_end. Have to extend vma.
|
|
|
*/
|
|
|
#ifndef CONFIG_IA64
|
|
|
-static inline
|
|
|
+static
|
|
|
#endif
|
|
|
int expand_upwards(struct vm_area_struct *vma, unsigned long address)
|
|
|
{
|
|
@@ -1641,7 +1641,7 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
|
|
|
/*
|
|
|
* vma is the first one with address < vma->vm_start. Have to extend vma.
|
|
|
*/
|
|
|
-static inline int expand_downwards(struct vm_area_struct *vma,
|
|
|
+static int expand_downwards(struct vm_area_struct *vma,
|
|
|
unsigned long address)
|
|
|
{
|
|
|
int error;
|
|
@@ -1703,7 +1703,7 @@ find_extend_vma(struct mm_struct *mm, unsigned long addr)
|
|
|
vma = find_vma_prev(mm, addr, &prev);
|
|
|
if (vma && (vma->vm_start <= addr))
|
|
|
return vma;
|
|
|
- if (!prev || expand_stack(prev, addr))
|
|
|
+ if (expand_stack(prev, addr))
|
|
|
return NULL;
|
|
|
if (prev->vm_flags & VM_LOCKED) {
|
|
|
if (mlock_vma_pages_range(prev, addr, prev->vm_end) < 0)
|