diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 14:25:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 14:25:40 -0800 |
| commit | 62ae144f56b61f541193df4a6465c06ee7eb9096 (patch) | |
| tree | 913cc058b162c48e6c72d2b016b9e44201b16cee /mm | |
| parent | bcd039b230f738243193ef7dbb03298d967b8370 (diff) | |
| parent | 2161558fa5bebfeb272493ae91e836b497029023 (diff) | |
Merge branch 'parisc' of master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
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) |