diff options
| author | Matthew Wilcox <willy@parisc-linux.org> | 2005-11-18 16:16:42 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@parisc-linux.org> | 2005-11-18 16:16:42 -0500 |
| commit | 9ab8851549fb9ed570013c33e0786a3fd084be41 (patch) | |
| tree | a5ed61d5e2a09ee0f8bd1a9e707b46954dff13ae | |
| parent | a39cf72ceb406e152c4682c0b635a96f1439c5ed (diff) | |
| download | talos-obmc-linux-9ab8851549fb9ed570013c33e0786a3fd084be41.tar.gz talos-obmc-linux-9ab8851549fb9ed570013c33e0786a3fd084be41.zip | |
[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>
| -rw-r--r-- | include/linux/mm.h | 2 | ||||
| -rw-r--r-- | mm/mmap.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 1013a42d10b1..0986d19be0b7 100644 --- a/include/linux/mm.h +++ b/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/mm/mmap.c b/mm/mmap.c index 6c997b159600..4f8def03428c 100644 --- a/mm/mmap.c +++ b/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) |
