lkml.org 
[lkml]   [2011]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[12/53] fs/proc/meminfo.c: fix compilation error
    3.1-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Claudio Scordino <claudio@evidence.eu.com>

    commit b53fc7c2974a50913f49e1d800fe904a28c338e3 upstream.

    Fix the error message "directives may not be used inside a macro argument"
    which appears when the kernel is compiled for the cris architecture.

    Signed-off-by: Claudio Scordino <claudio@evidence.eu.com>
    Cc: Andrea Arcangeli <aarcange@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/proc/meminfo.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    --- a/fs/proc/meminfo.c
    +++ b/fs/proc/meminfo.c
    @@ -131,12 +131,13 @@ static int meminfo_proc_show(struct seq_
    K(i.freeswap),
    K(global_page_state(NR_FILE_DIRTY)),
    K(global_page_state(NR_WRITEBACK)),
    - K(global_page_state(NR_ANON_PAGES)
    #ifdef CONFIG_TRANSPARENT_HUGEPAGE
    + K(global_page_state(NR_ANON_PAGES)
    + global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
    - HPAGE_PMD_NR
    + HPAGE_PMD_NR),
    +#else
    + K(global_page_state(NR_ANON_PAGES)),
    #endif
    - ),
    K(global_page_state(NR_FILE_MAPPED)),
    K(global_page_state(NR_SHMEM)),
    K(global_page_state(NR_SLAB_RECLAIMABLE) +



    \
     
     \ /
      Last update: 2011-12-16 20:51    [W:0.019 / U:1.560 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site