---

yaml --- r: 14467 b: refs/heads/master c: 9ab8851 h: refs/heads/master i: 14465: 978e1c2 14463: 9f1ef23 v: v3
git-mirror · Nov 18, 2005 · b5394e8 · b5394e8
1 parent 9911ab2
commit b5394e8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a39cf72ceb406e152c4682c0b635a96f1439c5ed
+refs/heads/master: 9ab8851549fb9ed570013c33e0786a3fd084be41
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
@@ -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);

diff --git a/trunk/mm/mmap.c b/trunk/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.
  * 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)