Browse Source

[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: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Matthew Wilcox 19 years ago
parent
commit
9ab8851549
2 changed files with 3 additions and 1 deletions
  1. 2 0
      include/linux/mm.h
  2. 1 1
      mm/mmap.c

+ 2 - 0
include/linux/mm.h

@@ -940,7 +940,9 @@ unsigned long max_sane_readahead(unsigned long nr);
 
 
 /* Do stack extension */
 /* Do stack extension */
 extern int expand_stack(struct vm_area_struct *vma, unsigned long address);
 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);
 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. */
 /* 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);
 extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr);

+ 1 - 1
mm/mmap.c

@@ -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.
  * 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.
  * vma is the last one with address > vma->vm_end.  Have to extend vma.
  */
  */
-#ifdef CONFIG_STACK_GROWSUP
+#ifndef CONFIG_IA64
 static inline
 static inline
 #endif
 #endif
 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
 int expand_upwards(struct vm_area_struct *vma, unsigned long address)