diff options
author | Tony Lindgren <tony@atomide.com> | 2012-06-29 06:07:08 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-06-29 06:07:08 -0700 |
commit | f6f1f12f6d4e9e4a44587e58ec96db25673083ec (patch) | |
tree | 68f44e3d64ebbee9f89c459136702ca243bbfa61 /mm/page_cgroup.c | |
parent | e0246e8ecad10b9437381b89756292ac031d4cfa (diff) | |
parent | a77e1c4d09c88f98ac2e653382d2c1861dbb736f (diff) |
Merge tag 'omap-devel-d-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes-non-criticalomap-fixes-non-critical-for-v3.6
Some OMAP AM35xx fixes.
The powerdomain and clockdomain data for the AM35xx are finally fixed.
The AM35xx EMAC/MDIO Ethernet controller integration code has been
converted to use the OMAP device and hwmod framework. Also the UART4
and HSOTGUSB warnings have been fixed.
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, /** * swap_cgroup_cmpxchg - cmpxchg mem_cgroup's id for this swp_entry. - * @end: swap entry to be cmpxchged + * @ent: swap entry to be cmpxchged * @old: old id * @new: new id * @@ -422,7 +422,7 @@ unsigned short swap_cgroup_cmpxchg(swp_entry_t ent, /** * swap_cgroup_record - record mem_cgroup for this swp_entry. * @ent: swap entry to be recorded into - * @mem: mem_cgroup to be recorded + * @id: mem_cgroup to be recorded * * Returns old value at success, 0 at failure. * (Of course, old value can be 0.) |