diff options
author | Matthew Wilcox <willy@parisc-linux.org> | 2005-11-18 22:16:42 +0100 |
---|---|---|
committer | Kyle McMartin <kyle@parisc-linux.org> | 2005-11-18 22:16:42 +0100 |
commit | 9ab8851549fb9ed570013c33e0786a3fd084be41 (patch) | |
tree | a5ed61d5e2a09ee0f8bd1a9e707b46954dff13ae /mm | |
parent | [PARISC] Make superio.c initialize before any driver needs it (diff) | |
download | linux-9ab8851549fb9ed570013c33e0786a3fd084be41.tar.xz 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>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/mmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |