Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ab88515 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Kyle McMartin
Browse files

[PARISC] Fix compile warning caused by conflicting types of expand_upwards() 



Fix compile warning caused by conflicting types of expand_upwards. IA64
requires it to not be static inline, as it's used outside mm/mmap.c

Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>
Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent a39cf72c

include/linux/mm.h

+2 −0
Original line number Diff line number Diff line
@@ -940,7 +940,9 @@ unsigned long max_sane_readahead(unsigned long nr); 


/* Do stack extension */

extern int expand_stack(struct vm_area_struct *vma, unsigned long address);

#ifdef CONFIG_IA64

extern int expand_upwards(struct vm_area_struct *vma, unsigned long address);

#endif



/* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */

extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr);

mm/mmap.c

+1 −1
Original line number Diff line number Diff line
@@ -1501,7 +1501,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un 
 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.

 * vma is the last one with address > vma->vm_end.  Have to extend vma.

 */

#ifdef CONFIG_STACK_GROWSUP

#ifndef CONFIG_IA64

static inline

#endif

int expand_upwards(struct vm_area_struct *vma, unsigned long address)