diff options
| author | Linus Torvalds | 2005-11-18 23:25:40 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2005-11-18 23:25:40 +0100 |
| commit | 62ae144f56b61f541193df4a6465c06ee7eb9096 (patch) | |
| tree | 913cc058b162c48e6c72d2b016b9e44201b16cee /include/linux | |
| parent | Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block (diff) | |
| parent | Merge branch 'master' (diff) | |
| download | kernel-qcow2-linux-62ae144f56b61f541193df4a6465c06ee7eb9096.tar.gz kernel-qcow2-linux-62ae144f56b61f541193df4a6465c06ee7eb9096.tar.xz kernel-qcow2-linux-62ae144f56b61f541193df4a6465c06ee7eb9096.zip | |
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 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); |