diff options
| author | James Morris | 2009-06-09 01:27:53 +0200 |
|---|---|---|
| committer | James Morris | 2009-06-09 01:27:53 +0200 |
| commit | 0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f (patch) | |
| tree | 1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed /include/linux/swap.h | |
| parent | integrity: ima audit dentry_open failure (diff) | |
| parent | async: Fix lack of boot-time console due to insufficient synchronization (diff) | |
| download | kernel-qcow2-linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.tar.gz kernel-qcow2-linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.tar.xz kernel-qcow2-linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.zip | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/swap.h')
| -rw-r--r-- | include/linux/swap.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h index 62d81435347a..d476aad3ff57 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -437,6 +437,11 @@ static inline int mem_cgroup_cache_charge_swapin(struct page *page, return 0; } +static inline void +mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent) +{ +} + #endif /* CONFIG_SWAP */ #endif /* __KERNEL__*/ #endif /* _LINUX_SWAP_H */ |