diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-29 13:34:54 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-29 13:34:54 -0400 |
| commit | 8eb2c0ee67f4853c0e433394f65ef8143a748c80 (patch) | |
| tree | ea74ea0878b2f07eb70f2d5b42be5ec42f3bdb5f /include/linux/swap.h | |
| parent | 3e0dc6b01f5301d63046f6deddde2c7f5c57d67a (diff) | |
| parent | 0d72c6fcb5cd215eeab824fac216ea42c5b574aa (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'include/linux/swap.h')
| -rw-r--r-- | include/linux/swap.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h index e70564647039..a273468f8285 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h | |||
| @@ -300,16 +300,6 @@ static inline void scan_unevictable_unregister_node(struct node *node) | |||
| 300 | extern int kswapd_run(int nid); | 300 | extern int kswapd_run(int nid); |
| 301 | extern void kswapd_stop(int nid); | 301 | extern void kswapd_stop(int nid); |
| 302 | 302 | ||
| 303 | #ifdef CONFIG_MMU | ||
| 304 | /* linux/mm/shmem.c */ | ||
| 305 | extern int shmem_unuse(swp_entry_t entry, struct page *page); | ||
| 306 | #endif /* CONFIG_MMU */ | ||
| 307 | |||
| 308 | #ifdef CONFIG_CGROUP_MEM_RES_CTLR | ||
| 309 | extern void mem_cgroup_get_shmem_target(struct inode *inode, pgoff_t pgoff, | ||
| 310 | struct page **pagep, swp_entry_t *ent); | ||
| 311 | #endif | ||
| 312 | |||
| 313 | #ifdef CONFIG_SWAP | 303 | #ifdef CONFIG_SWAP |
| 314 | /* linux/mm/page_io.c */ | 304 | /* linux/mm/page_io.c */ |
| 315 | extern int swap_readpage(struct page *); | 305 | extern int swap_readpage(struct page *); |