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 /include/linux | |
| parent | bcd039b230f738243193ef7dbb03298d967b8370 (diff) | |
| parent | 2161558fa5bebfeb272493ae91e836b497029023 (diff) | |
| download | op-kernel-dev-62ae144f56b61f541193df4a6465c06ee7eb9096.zip op-kernel-dev-62ae144f56b61f541193df4a6465c06ee7eb9096.tar.gz | |
Merge branch 'parisc' of master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 1013a42..0986d19 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); |
