lkml.org 
[lkml]   [2010]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH -mmotm] build fix for memcg-improve-performance-in-moving-swap-charge.patch
    build fix in !CONFIG_CGROUP_MEM_RES_CTLR_SWAP case.

    CC mm/memcontrol.o
    mm/memcontrol.c: In function 'mem_cgroup_move_charge_pte_range':
    mm/memcontrol.c:3899: error: too many arguments to function 'mem_cgroup_move_swap_account'
    mm/memcontrol.c:3899: error: too many arguments to function 'mem_cgroup_move_swap_account'
    mm/memcontrol.c:3899: error: too many arguments to function 'mem_cgroup_move_swap_account'
    make[1]: *** [mm/memcontrol.o] Error 1
    make: *** [mm] Error 2

    Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    ---
    This can be applied after memcg-improve-performance-in-moving-swap-charge.patch.

    mm/memcontrol.c | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/mm/memcontrol.c b/mm/memcontrol.c
    index 5360d48..65df8d2 100644
    --- a/mm/memcontrol.c
    +++ b/mm/memcontrol.c
    @@ -2326,7 +2326,7 @@ static int mem_cgroup_move_swap_account(swp_entry_t entry,
    }
    #else
    static inline int mem_cgroup_move_swap_account(swp_entry_t entry,
    - struct mem_cgroup *from, struct mem_cgroup *to)
    + struct mem_cgroup *from, struct mem_cgroup *to, bool need_fixup)
    {
    return -EINVAL;
    }
    --
    1.5.6.1


    \
     
     \ /
      Last update: 2010-01-07 05:13    [W:0.022 / U:0.664 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site