On Thursday 19 November 2015 16:18:43 Russell King - ARM Linux wrote: > On Thu, Nov 19, 2015 at 12:25:45PM +0100, Arnd Bergmann wrote: > > On Thursday 19 November 2015 03:40:25 Chen Gang wrote: > > > diff --git a/include/asm-generic/page.h b/include/asm-generic/page.h > > > index 37d1fe2..67cfb7d 100644 > > > --- a/include/asm-generic/page.h > > > +++ b/include/asm-generic/page.h > > > @@ -24,9 +24,6 @@ > > > > > > #ifndef __ASSEMBLY__ > > > > > > -#define get_user_page(vaddr) __get_free_page(GFP_KERNEL) > > > -#define free_user_page(page, addr) free_page(addr) > > > - > > > #define clear_page(page) memset((page), 0, PAGE_SIZE) > > > #define copy_page(to,from) memcpy((to), (from), PAGE_SIZE) > > > > > > > > > > Looks good. I can take the asm-generic portion when you split it up, and > > I can also help you merge the remaining patches in case some of > > the arch maintainers fail to pick them up. I think all five of them > > are actively maintained though, so the patches should just go through > > the respective architecture trees. > > Or we just ack the patch and have it go through one tree, which I think > is the most sensible. I can't imagine that there would be any major > conflicts here, surely no one is constantly changing their asm/page.h ?
Yes, good point, there is really very little potential for conflicts here. I've applied it into my asm-generic tree for now, but will revert it if we get regressions or NAKs. For some reason, the patch was whitespace broken, but I managed to extract it from the attachment. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/