diff options
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/filemap.c | 4 | ||||
| -rw-r--r-- | mm/swapfile.c | 2 | ||||
| -rw-r--r-- | mm/vmalloc.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 4c89ad3e9156..7c64c5a05229 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -9,7 +9,7 @@ * most "normal" filesystems (but you don't /have/ to use this: * the NFS filesystem used to do this differently, for example) */ -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/shm.h> #include <linux/mman.h> #include <linux/locks.h> @@ -397,7 +397,7 @@ int generic_buffer_fdatasync(struct inode *inode, unsigned long start_idx, unsig retval |= do_buffer_fdatasync(&inode->i_mapping->locked_pages, start_idx, end_idx, writeout_one_page); /* now wait for locked buffers on pages from both clean and dirty lists */ - retval |= do_buffer_fdatasync(&inode->i_mapping->dirty_pages, start_idx, end_idx, writeout_one_page); + retval |= do_buffer_fdatasync(&inode->i_mapping->dirty_pages, start_idx, end_idx, waitfor_one_page); retval |= do_buffer_fdatasync(&inode->i_mapping->clean_pages, start_idx, end_idx, waitfor_one_page); retval |= do_buffer_fdatasync(&inode->i_mapping->locked_pages, start_idx, end_idx, waitfor_one_page); diff --git a/mm/swapfile.c b/mm/swapfile.c index 57f815638752..f02800bc6586 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -5,7 +5,7 @@ * Swap reorganised 29.12.95, Stephen Tweedie */ -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/smp_lock.h> #include <linux/kernel_stat.h> #include <linux/swap.h> diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 93edab662caa..ab74d114bebf 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -6,7 +6,7 @@ * SMP-safe vmalloc/vfree/ioremap, Tigran Aivazian <tigran@veritas.com>, May 2000 */ -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/spinlock.h> #include <linux/highmem.h> |