diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-23 00:37:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-23 00:37:07 -0700 |
| commit | aea40b2905d269b11a7382d84e9cb0f4c067922e (patch) | |
| tree | 3cf16968659fa6a43a2b5e28ece06dc305d320b2 /kernel/fork.c | |
| parent | 01a17cfd0ccd0bea05f4000f4560807507fbed84 (diff) | |
| parent | 9c9dada1d5cfd06f06b00ef84ef01839b9ac65ed (diff) | |
Merge bk://linux-ntfs.bkbits.net/ntfs-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 8e28c1fec202..601abf6bbbb8 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -29,6 +29,7 @@ #include <linux/fs.h> #include <linux/cpu.h> #include <linux/security.h> +#include <linux/swap.h> #include <linux/syscalls.h> #include <linux/jiffies.h> #include <linux/futex.h> @@ -324,7 +325,6 @@ static inline int dup_mmap(struct mm_struct * mm, struct mm_struct * oldmm) tmp->vm_mm = mm; tmp->vm_next = NULL; anon_vma_link(tmp); - vma_prio_tree_init(tmp); file = tmp->vm_file; if (file) { struct inode *inode = file->f_dentry->d_inode; @@ -462,6 +462,7 @@ void mmput(struct mm_struct *mm) spin_unlock(&mmlist_lock); exit_aio(mm); exit_mmap(mm); + put_swap_token(mm); mmdrop(mm); } } |