Message ID | 20170627134033.d6df2435117d52721d37a748@linux-foundation.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi Andrew, On Tue, 27 Jun 2017 13:40:33 -0700 Andrew Morton <akpm@linux-foundation.org> wrote: > > oops, that was me manually fixing rejects - I missed a bit. > > --- a/mm/page_alloc.c~mm-page_allocc-eliminate-unsigned-confusion-in-__rmqueue_fallback-fix > +++ a/mm/page_alloc.c > @@ -2212,7 +2212,7 @@ static bool unreserve_highatomic_pageblo > * condition simpler. > */ > static inline bool > -__rmqueue_fallback(struct zone *zone, unsigned int order, int start_migratetype) > +__rmqueue_fallback(struct zone *zone, int order, int start_migratetype) > { > struct free_area *area; > int current_order; > _ > I have pushed that into the original patch in linux-next for today.
Hi Andrew, On Wed, 28 Jun 2017 07:56:42 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > On Tue, 27 Jun 2017 13:40:33 -0700 Andrew Morton <akpm@linux-foundation.org> wrote: > > > > oops, that was me manually fixing rejects - I missed a bit. > > > > --- a/mm/page_alloc.c~mm-page_allocc-eliminate-unsigned-confusion-in-__rmqueue_fallback-fix > > +++ a/mm/page_alloc.c > > @@ -2212,7 +2212,7 @@ static bool unreserve_highatomic_pageblo > > * condition simpler. > > */ > > static inline bool > > -__rmqueue_fallback(struct zone *zone, unsigned int order, int start_migratetype) > > +__rmqueue_fallback(struct zone *zone, int order, int start_migratetype) > > { > > struct free_area *area; > > int current_order; > > _ > > > > I have pushed that into the original patch in linux-next for today. But I guess that is irrelevant now :-)
--- a/mm/page_alloc.c~mm-page_allocc-eliminate-unsigned-confusion-in-__rmqueue_fallback-fix +++ a/mm/page_alloc.c @@ -2212,7 +2212,7 @@ static bool unreserve_highatomic_pageblo * condition simpler. */ static inline bool -__rmqueue_fallback(struct zone *zone, unsigned int order, int start_migratetype) +__rmqueue_fallback(struct zone *zone, int order, int start_migratetype) { struct free_area *area; int current_order;