lkml.org 
[lkml]   [2008]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [2.6 patch] fix mm/mm_init.c compilation
    On Tue, 5 Aug 2008 08:51:23 +0100 Mel Gorman <mel@csn.ul.ie> wrote:

    > > > --- a/mm/mm_init.c
    > > > +++ b/mm/mm_init.c
    > > > @@ -63,6 +63,13 @@ void __init mminit_verify_pageflags_layout(void)
    > > > {
    > > > int shift, width;
    > > > unsigned long or_mask, add_mask;
    > > > + int sections_shift;
    > > > +
    > > > +#ifdef SECTIONS_SHIFT
    > > > + sections_shift = SECTIONS_SHIFT;
    > > > +#else
    > > > + sections_shift = 0;
    > > > +#endif
    > > >
    > > > shift = 8 * sizeof(unsigned long);
    > > > width = shift - SECTIONS_WIDTH - NODES_WIDTH - ZONES_WIDTH;
    > > > @@ -74,11 +81,7 @@ void __init mminit_verify_pageflags_layout(void)
    > > > NR_PAGEFLAGS);
    > > > mminit_dprintk(MMINIT_TRACE, "pageflags_layout_shifts",
    > > > "Section %d Node %d Zone %d\n",
    > > > -#ifdef SECTIONS_SHIFT
    > > > - SECTIONS_SHIFT,
    > > > -#else
    > > > - 0,
    > > > -#endif
    > > > + sections_shift,
    > > > NODES_SHIFT,
    > > > ZONES_SHIFT);
    > > > mminit_dprintk(MMINIT_TRACE, "pageflags_layout_offsets",
    > >
    > > OK, ifdefs inside macro expansion aren't a great idea.
    > >
    > > Mel, is there any erason why we shouldn't do it this way?
    > >
    >
    > The only minor nit is SECTIONS_SHIFT is defined outside of SPARSEMEM even
    > though it has no meaning there. There is no problem with this as such but
    > someone being silly might use SECTIONS_SHIFT accidently. If this sort of
    > behaviour was considered a possibility, we could add something like this to
    > mm/mm_init.c instead?

    That sounds sane.

    diff -puN mm/mm_init.c~mm_initc-avoid-ifdef-inside-macro-expansion mm/mm_init.c
    --- a/mm/mm_init.c~mm_initc-avoid-ifdef-inside-macro-expansion
    +++ a/mm/mm_init.c
    @@ -14,6 +14,10 @@
    #ifdef CONFIG_DEBUG_MEMORY_INIT
    int __meminitdata mminit_loglevel;

    +#ifndef SECTIONS_SHIFT
    +#define SECTIONS_SHIFT 0
    +#endif
    +
    /* The zonelists are simply reported, validation is manual. */
    void mminit_verify_zonelist(void)
    {
    @@ -74,11 +78,7 @@ void __init mminit_verify_pageflags_layo
    NR_PAGEFLAGS);
    mminit_dprintk(MMINIT_TRACE, "pageflags_layout_shifts",
    "Section %d Node %d Zone %d\n",
    -#ifdef SECTIONS_SHIFT
    SECTIONS_SHIFT,
    -#else
    - 0,
    -#endif
    NODES_SHIFT,
    ZONES_SHIFT);
    mminit_dprintk(MMINIT_TRACE, "pageflags_layout_offsets",
    _


    \
     
     \ /
      Last update: 2008-08-05 11:15    [W:0.030 / U:60.224 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site