diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 09:08:14 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 09:08:14 +0400 |
| commit | 33c2a174120b2c1baec9d1dac513f9d4b761b26a (patch) | |
| tree | 9bd9a2c1ae13a3b123a238d9ebeabbc3cfe56a96 /include | |
| parent | 88265322c14cce39f7afbc416726ef4fac413298 (diff) | |
| parent | e3483a5f3a8ef448c229a2aceca9b2ad6a46b8ec (diff) | |
| download | linux-33c2a174120b2c1baec9d1dac513f9d4b761b26a.tar.xz | |
Merge tag 'stable/for-linus-3.7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm
Pull frontswap update from Konrad Rzeszutek Wilk:
"Features:
- Support exlusive get if backend is capable.
Bug-fixes:
- Fix compile warnings
- Add comments/cleanup doc
- Fix wrong if condition"
* tag 'stable/for-linus-3.7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:
frontswap: support exclusive gets if tmem backend is capable
mm: frontswap: fix a wrong if condition in frontswap_shrink
mm/frontswap: fix uninit'ed variable warning
mm/frontswap: cleanup doc and comment error
mm: frontswap: remove unneeded headers
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/frontswap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h index 0e4e2eec5c1d..30442547b9e6 100644 --- a/include/linux/frontswap.h +++ b/include/linux/frontswap.h @@ -19,6 +19,8 @@ extern struct frontswap_ops extern void frontswap_shrink(unsigned long); extern unsigned long frontswap_curr_pages(void); extern void frontswap_writethrough(bool); +#define FRONTSWAP_HAS_EXCLUSIVE_GETS +extern void frontswap_tmem_exclusive_gets(bool); extern void __frontswap_init(unsigned type); extern int __frontswap_store(struct page *page); |