| Message ID | COL130-W7B5F0BB94C76AF6B12EA7B91C0@phx.gbl |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
On Thu, Nov 19, 2015 at 03:40:25AM +0800, Chen Gang wrote: > >From ba7c00c4cb976109b6a35812ce9649aaeda81e2d Mon Sep 17 00:00:00 2001 > From: Chen Gang <gang.chen.5i5j@gmail.com> > Date: Thu, 19 Nov 2015 03:24:42 +0800 > Subject: [PATCH] include: asm-generic: page.h: Remove useless get_user_page and free_user_page > > They are not symmetric with each other, neither are used in real world > (can not be found by grep command in source code root directory), so > remove them. > > Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> For: > arch/arm/include/asm/page-nommu.h | 3 --- Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
On Thursday 19 November 2015 01:10 AM, Chen Gang wrote: > From ba7c00c4cb976109b6a35812ce9649aaeda81e2d Mon Sep 17 00:00:00 2001 > From: Chen Gang <gang.chen.5i5j@gmail.com> > Date: Thu, 19 Nov 2015 03:24:42 +0800 > Subject: [PATCH] include: asm-generic: page.h: Remove useless get_user_page and free_user_page > > They are not symmetric with each other, neither are used in real world > (can not be found by grep command in source code root directory), so > remove them. > > Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> > --- > arch/arc/include/asm/page.h | 3 --- > arch/arm/include/asm/page-nommu.h | 3 --- > arch/frv/include/asm/page.h | 3 --- > arch/m68k/include/asm/page_mm.h | 3 --- > arch/m68k/include/asm/page_no.h | 3 --- > arch/openrisc/include/asm/page.h | 3 --- > include/asm-generic/page.h | 3 --- > 7 files changed, 21 deletions(-) So this is one huge patch touching several arches with potential to cause conflicts when merged. Can u divy them up and then the maintainers can simply merge them individually given there is no common dependency !
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. Arnd
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 ?
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
Thank all of you for your work. At present, it is also queued into akpm tree, and will be seen in the next-tree soon. For me, this patch looks cross multi-archs, but it is still very simple. I found this patch only because I am learning mm sub-system. I am reading mm headers to be familiar with them, so can understand mm globally based on code. These headers are common sense for most mm/arch members, but for me (almost a newbie), they are not (need be familiar). Thanks. On 11/20/15 00:35, Arnd Bergmann wrote: > 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 >
Hi Chen, On 19/11/15 05:40, Chen Gang wrote: >>From ba7c00c4cb976109b6a35812ce9649aaeda81e2d Mon Sep 17 00:00:00 2001 > From: Chen Gang <gang.chen.5i5j@gmail.com> > Date: Thu, 19 Nov 2015 03:24:42 +0800 > Subject: [PATCH] include: asm-generic: page.h: Remove useless get_user_page and free_user_page > > They are not symmetric with each other, neither are used in real world > (can not be found by grep command in source code root directory), so > remove them. > > Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> Compile and run tested on m68k (MMU and noMMU) targets. No problems found. So for those parts: Acked-by: Greg Ungerer <gerg@uclinux.org> Regards Greg > --- > arch/arc/include/asm/page.h | 3 --- > arch/arm/include/asm/page-nommu.h | 3 --- > arch/frv/include/asm/page.h | 3 --- > arch/m68k/include/asm/page_mm.h | 3 --- > arch/m68k/include/asm/page_no.h | 3 --- > arch/openrisc/include/asm/page.h | 3 --- > include/asm-generic/page.h | 3 --- > 7 files changed, 21 deletions(-) > > diff --git a/arch/arc/include/asm/page.h b/arch/arc/include/asm/page.h > index 429957f..adf5cbb 100644 > --- a/arch/arc/include/asm/page.h > +++ b/arch/arc/include/asm/page.h > @@ -13,9 +13,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(paddr) memset((paddr), 0, PAGE_SIZE) > #define copy_page(to, from) memcpy((to), (from), PAGE_SIZE) > > diff --git a/arch/arm/include/asm/page-nommu.h b/arch/arm/include/asm/page-nommu.h > index d1b162a..503f488 100644 > --- a/arch/arm/include/asm/page-nommu.h > +++ b/arch/arm/include/asm/page-nommu.h > @@ -17,9 +17,6 @@ > #define KTHREAD_SIZE PAGE_SIZE > #endif > > -#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) > > diff --git a/arch/frv/include/asm/page.h b/arch/frv/include/asm/page.h > index 8c97068..52ace96 100644 > --- a/arch/frv/include/asm/page.h > +++ b/arch/frv/include/asm/page.h > @@ -8,9 +8,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(pgaddr) memset((pgaddr), 0, PAGE_SIZE) > #define copy_page(to,from) memcpy((to), (from), PAGE_SIZE) > > diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h > index 5029f73..e7a1946 100644 > --- a/arch/m68k/include/asm/page_mm.h > +++ b/arch/m68k/include/asm/page_mm.h > @@ -6,9 +6,6 @@ > #include <linux/compiler.h> > #include <asm/module.h> > > -#define get_user_page(vaddr) __get_free_page(GFP_KERNEL) > -#define free_user_page(page, addr) free_page(addr) > - > /* > * We don't need to check for alignment etc. > */ > diff --git a/arch/m68k/include/asm/page_no.h b/arch/m68k/include/asm/page_no.h > index ef20916..fa7f32d 100644 > --- a/arch/m68k/include/asm/page_no.h > +++ b/arch/m68k/include/asm/page_no.h > @@ -6,9 +6,6 @@ > extern unsigned long memory_start; > extern unsigned long memory_end; > > -#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) > > diff --git a/arch/openrisc/include/asm/page.h b/arch/openrisc/include/asm/page.h > index 108906f..e613d36 100644 > --- a/arch/openrisc/include/asm/page.h > +++ b/arch/openrisc/include/asm/page.h > @@ -40,9 +40,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) > > 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) > > -- > 1.9.3 > > >
diff --git a/arch/arc/include/asm/page.h b/arch/arc/include/asm/page.h index 429957f..adf5cbb 100644 --- a/arch/arc/include/asm/page.h +++ b/arch/arc/include/asm/page.h @@ -13,9 +13,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(paddr) memset((paddr), 0, PAGE_SIZE) #define copy_page(to, from) memcpy((to), (from), PAGE_SIZE) diff --git a/arch/arm/include/asm/page-nommu.h b/arch/arm/include/asm/page-nommu.h index d1b162a..503f488 100644 --- a/arch/arm/include/asm/page-nommu.h +++ b/arch/arm/include/asm/page-nommu.h @@ -17,9 +17,6 @@ #define KTHREAD_SIZE PAGE_SIZE #endif -#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) diff --git a/arch/frv/include/asm/page.h b/arch/frv/include/asm/page.h index 8c97068..52ace96 100644 --- a/arch/frv/include/asm/page.h +++ b/arch/frv/include/asm/page.h @@ -8,9 +8,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(pgaddr) memset((pgaddr), 0, PAGE_SIZE) #define copy_page(to,from) memcpy((to), (from), PAGE_SIZE) diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h index 5029f73..e7a1946 100644 --- a/arch/m68k/include/asm/page_mm.h +++ b/arch/m68k/include/asm/page_mm.h @@ -6,9 +6,6 @@ #include <linux/compiler.h> #include <asm/module.h> -#define get_user_page(vaddr) __get_free_page(GFP_KERNEL) -#define free_user_page(page, addr) free_page(addr) - /* * We don't need to check for alignment etc. */ diff --git a/arch/m68k/include/asm/page_no.h b/arch/m68k/include/asm/page_no.h index ef20916..fa7f32d 100644 --- a/arch/m68k/include/asm/page_no.h +++ b/arch/m68k/include/asm/page_no.h @@ -6,9 +6,6 @@ extern unsigned long memory_start; extern unsigned long memory_end; -#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) diff --git a/arch/openrisc/include/asm/page.h b/arch/openrisc/include/asm/page.h index 108906f..e613d36 100644 --- a/arch/openrisc/include/asm/page.h +++ b/arch/openrisc/include/asm/page.h @@ -40,9 +40,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) 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)