From b5394e80896aaf94b6c414af87db70e01d925822 Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Fri, 18 Nov 2005 16:16:42 -0500 Subject: [PATCH] --- yaml --- r: 14467 b: refs/heads/master c: 9ab8851549fb9ed570013c33e0786a3fd084be41 h: refs/heads/master i: 14465: 978e1c296c436b031502f0d9af7300c19f4b0954 14463: 9f1ef23a0fa3fc140be321d5561e4c1c43ee6d04 v: v3 --- [refs] | 2 +- trunk/include/linux/mm.h | 2 ++ trunk/mm/mmap.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 39e3c076f49d..d73e45c91919 100644 --- 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 index 1013a42d10b1..0986d19be0b7 100644 --- 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 index 6c997b159600..4f8def03428c 100644 --- 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)