lkml.org 
[lkml]   [2011]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[27/53] drivers/base/node.c: fix compilation error with older versions of gcc
    3.0-stable review patch.  If anyone has any objections, please let me know.

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

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

    commit 91a13c281d7d4648c0b32dede11a0144c4e7984c upstream.

    Patch to 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>
    Acked-by: David Rientjes <rientjes@google.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/base/node.c | 14 ++++++++------
    1 file changed, 8 insertions(+), 6 deletions(-)

    --- a/drivers/base/node.c
    +++ b/drivers/base/node.c
    @@ -127,12 +127,13 @@ static ssize_t node_read_meminfo(struct
    nid, K(node_page_state(nid, NR_WRITEBACK)),
    nid, K(node_page_state(nid, NR_FILE_PAGES)),
    nid, K(node_page_state(nid, NR_FILE_MAPPED)),
    - nid, K(node_page_state(nid, NR_ANON_PAGES)
    #ifdef CONFIG_TRANSPARENT_HUGEPAGE
    + nid, K(node_page_state(nid, NR_ANON_PAGES)
    + node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *
    - HPAGE_PMD_NR
    + HPAGE_PMD_NR),
    +#else
    + nid, K(node_page_state(nid, NR_ANON_PAGES)),
    #endif
    - ),
    nid, K(node_page_state(nid, NR_SHMEM)),
    nid, node_page_state(nid, NR_KERNEL_STACK) *
    THREAD_SIZE / 1024,
    @@ -143,13 +144,14 @@ static ssize_t node_read_meminfo(struct
    nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE) +
    node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),
    nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE)),
    - nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))
    #ifdef CONFIG_TRANSPARENT_HUGEPAGE
    + nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))
    , nid,
    K(node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *
    - HPAGE_PMD_NR)
    + HPAGE_PMD_NR));
    +#else
    + nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)));
    #endif
    - );
    n += hugetlb_report_node_meminfo(nid, buf + n);
    return n;
    }



    \
     
     \ /
      Last update: 2011-11-23 01:43    [W:0.020 / U:121.108 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site