diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-11 03:41:37 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-11 03:41:37 -0400 |
| commit | 92254d31444aad272155f7963e65910c402703dd (patch) | |
| tree | 8e454ebe60cbac9a71b1771d4e471cfe54826963 /mm/page_cgroup.c | |
| parent | 707ecec1dc80d54163356a25d145c62083e7be60 (diff) | |
| parent | bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff) | |
Merge tag 'v3.5-rc6' into x86/mce
Merge Linux 3.5-rc6 before merging more code.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/page_cgroup.c')
| -rw-r--r-- | mm/page_cgroup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c index 1ccbd714059c..eb750f851395 100644 --- a/mm/page_cgroup.c +++ b/mm/page_cgroup.c | |||
| @@ -392,7 +392,7 @@ static struct swap_cgroup *lookup_swap_cgroup(swp_entry_t ent, | |||
| 392 | 392 | ||
| 393 | /** | 393 | /** |
| 394 | * swap_cgroup_cmpxchg - cmpxchg mem_cgroup's id for this swp_entry. | 394 | * swap_cgroup_cmpxchg - cmpxchg mem_cgroup's id for this swp_entry. |
| 395 | * @end: swap entry to be cmpxchged | 395 | * @ent: swap entry to be cmpxchged |
| 396 | * @old: old id | 396 | * @old: old id |
| 397 | * @new: new id | 397 | * @new: new id |
| 398 | * | 398 | * |
| @@ -422,7 +422,7 @@ unsigned short swap_cgroup_cmpxchg(swp_entry_t ent, | |||
| 422 | /** | 422 | /** |
| 423 | * swap_cgroup_record - record mem_cgroup for this swp_entry. | 423 | * swap_cgroup_record - record mem_cgroup for this swp_entry. |
| 424 | * @ent: swap entry to be recorded into | 424 | * @ent: swap entry to be recorded into |
| 425 | * @mem: mem_cgroup to be recorded | 425 | * @id: mem_cgroup to be recorded |
| 426 | * | 426 | * |
| 427 | * Returns old value at success, 0 at failure. | 427 | * Returns old value at success, 0 at failure. |
| 428 | * (Of course, old value can be 0.) | 428 | * (Of course, old value can be 0.) |