diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 19:54:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 19:54:12 -0500 |
| commit | 625876f32ed63af262db3d0ac8178d2c0f510636 (patch) | |
| tree | 93a0d2d5332fa679ecb99eee7b0955e444d6a41a /mm/mmap.c | |
| parent | c902f981b79b512eb3d0c0410f8cae88c78beb57 (diff) | |
| parent | b286e39207237e2f6929959372bf66d9a8d05a82 (diff) | |
Merge branch 'master'
Diffstat (limited to 'mm/mmap.c')
| -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 6c997b15960..4f8def03428 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) |