On Mon, Nov 16, 2015 at 09:44:11PM -0800, David Rientjes wrote:
> On Tue, 17 Nov 2015, Yaowei Bai wrote:
>
> > diff --git a/include/linux/gfp.h b/include/linux/gfp.h
> > index 6523109..14a6249 100644
> > --- a/include/linux/gfp.h
> > +++ b/include/linux/gfp.h
> > @@ -378,9 +378,9 @@ static inline enum zone_type gfp_zone(gfp_t flags)
> > static inline int gfp_zonelist(gfp_t flags)
> > {
> > if (IS_ENABLED(CONFIG_NUMA) && unlikely(flags & __GFP_THISNODE))
> > - return 1;
> > + return ZONELIST_NOFALLBACK;
> >
> > - return 0;
> > + return ZONELIST_FALLBACK;
> > }
> >
> > /*
> > diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
> > index e23a9e7..9664d6c 100644
> > --- a/include/linux/mmzone.h
> > +++ b/include/linux/mmzone.h
> > @@ -576,8 +576,6 @@ static inline bool zone_is_empty(struct zone *zone)
> > /* Maximum number of zones on a zonelist */
> > #define MAX_ZONES_PER_ZONELIST (MAX_NUMNODES * MAX_NR_ZONES)
> >
> > -#ifdef CONFIG_NUMA
> > -
> > /*
> > * The NUMA zonelists are doubled because we need zonelists that restrict the
> > * allocations to a single node for __GFP_THISNODE.
> > @@ -585,10 +583,13 @@ static inline bool zone_is_empty(struct zone *zone)
> > * [0] : Zonelist with fallback
> > * [1] : No fallback (__GFP_THISNODE)
> > */
> > -#define MAX_ZONELISTS 2
> > -#else
> > -#define MAX_ZONELISTS 1
> > +enum {
> > + ZONELIST_FALLBACK,
> > +#ifdef CONFIG_NUMA
> > + ZONELIST_NOFALLBACK,
> > #endif
> > + MAX_ZONELISTS
> > +};
> >
> > /*
> > * This struct contains information about a zone in a zonelist. It is stored
>
> This is a different change than the original.
The original patch doesn't make sense as you said so let's drop it.
> I don't see a benefit from
> it, but I have no strong feelings on it. If someone else finds value in
> this, please update the comment when defining the enum as well.
OK, i'll send a update patch to review first and if nobody disagrees with it i will
resend this patchset.
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>