projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[cascardo/linux.git]
/
mm
/
swap_state.c
diff --git
a/mm/swap_state.c
b/mm/swap_state.c
index
ec42f01
..
d8aadaf
100644
(file)
--- a/
mm/swap_state.c
+++ b/
mm/swap_state.c
@@
-33,7
+33,7
@@
static const struct address_space_operations swap_aops = {
};
static struct backing_dev_info swap_backing_dev_info = {
};
static struct backing_dev_info swap_backing_dev_info = {
- .capabilities = BDI_CAP_NO_ACCT_
DIRTY | BDI_CAP_NO
_WRITEBACK,
+ .capabilities = BDI_CAP_NO_ACCT_
AND
_WRITEBACK,
.unplug_io_fn = swap_unplug_io_fn,
};
.unplug_io_fn = swap_unplug_io_fn,
};
@@
-115,6
+115,7
@@
void __delete_from_swap_cache(struct page *page)
/**
* add_to_swap - allocate swap space for a page
* @page: page we want to move to swap
/**
* add_to_swap - allocate swap space for a page
* @page: page we want to move to swap
+ * @gfp_mask: memory allocation flags
*
* Allocate swap space for the page and add the page to the
* swap cache. Caller needs to hold the page lock.
*
* Allocate swap space for the page and add the page to the
* swap cache. Caller needs to hold the page lock.
@@
-315,6
+316,7
@@
struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
/**
* swapin_readahead - swap in pages in hope we need them soon
* @entry: swap entry of this memory
/**
* swapin_readahead - swap in pages in hope we need them soon
* @entry: swap entry of this memory
+ * @gfp_mask: memory allocation flags
* @vma: user vma this address belongs to
* @addr: target address for mempolicy
*
* @vma: user vma this address belongs to
* @addr: target address for mempolicy
*