2015-07-23 05:42:07

by Naoya Horiguchi

Subject: [PATCH] mm, page_isolation: make set/unset_migratetype_isolate() file-local

Nowaday, set/unset_migratetype_isolate() is defined and used only in
mm/page_isolation, so let's limit the scope within the file.

Signed-off-by: Naoya Horiguchi <[email protected]>
---
include/linux/page-isolation.h | 5 -----
mm/page_isolation.c | 5 +++--
2 files changed, 3 insertions(+), 7 deletions(-)

diff --git v4.2-rc2.orig/include/linux/page-isolation.h v4.2-rc2/include/linux/page-isolation.h
index 2dc1e1697b45..047d64706f2a 100644
--- v4.2-rc2.orig/include/linux/page-isolation.h
+++ v4.2-rc2/include/linux/page-isolation.h
@@ -65,11 +65,6 @@ undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn,
bool skip_hwpoisoned_pages);

-/*
- * Internal functions. Changes pageblock's migrate type.
- */
-int set_migratetype_isolate(struct page *page, bool skip_hwpoisoned_pages);
-void unset_migratetype_isolate(struct page *page, unsigned migratetype);
struct page *alloc_migrate_target(struct page *page, unsigned long private,
int **resultp);

diff --git v4.2-rc2.orig/mm/page_isolation.c v4.2-rc2/mm/page_isolation.c
index 32fdc1df05e5..4568fd58f70a 100644
--- v4.2-rc2.orig/mm/page_isolation.c
+++ v4.2-rc2/mm/page_isolation.c
@@ -9,7 +9,8 @@
#include <linux/hugetlb.h>
#include "internal.h"

-int set_migratetype_isolate(struct page *page, bool skip_hwpoisoned_pages)
+static int set_migratetype_isolate(struct page *page,
+ bool skip_hwpoisoned_pages)
{
struct zone *zone;
unsigned long flags, pfn;
@@ -72,7 +73,7 @@ int set_migratetype_isolate(struct page *page, bool skip_hwpoisoned_pages)
return ret;
}

-void unset_migratetype_isolate(struct page *page, unsigned migratetype)
+static void unset_migratetype_isolate(struct page *page, unsigned migratetype)
{
struct zone *zone;
unsigned long flags, nr_pages;
--
2.4.3

2015-07-23 18:34:17

by Vlastimil Babka

Subject: Re: [PATCH] mm, page_isolation: make set/unset_migratetype_isolate() file-local

On 07/23/2015 07:40 AM, Naoya Horiguchi wrote:
> Nowaday, set/unset_migratetype_isolate() is defined and used only in
> mm/page_isolation, so let's limit the scope within the file.
>
> Signed-off-by: Naoya Horiguchi <[email protected]>

Acked-by: Vlastimil Babka <[email protected]>

> ---
> include/linux/page-isolation.h | 5 -----
> mm/page_isolation.c | 5 +++--
> 2 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git v4.2-rc2.orig/include/linux/page-isolation.h v4.2-rc2/include/linux/page-isolation.h
> index 2dc1e1697b45..047d64706f2a 100644
> --- v4.2-rc2.orig/include/linux/page-isolation.h
> +++ v4.2-rc2/include/linux/page-isolation.h
> @@ -65,11 +65,6 @@ undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
> int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn,
> bool skip_hwpoisoned_pages);
>
> -/*
> - * Internal functions. Changes pageblock's migrate type.
> - */
> -int set_migratetype_isolate(struct page *page, bool skip_hwpoisoned_pages);
> -void unset_migratetype_isolate(struct page *page, unsigned migratetype);
> struct page *alloc_migrate_target(struct page *page, unsigned long private,
> int **resultp);
>
> diff --git v4.2-rc2.orig/mm/page_isolation.c v4.2-rc2/mm/page_isolation.c
> index 32fdc1df05e5..4568fd58f70a 100644
> --- v4.2-rc2.orig/mm/page_isolation.c
> +++ v4.2-rc2/mm/page_isolation.c
> @@ -9,7 +9,8 @@
> #include <linux/hugetlb.h>
> #include "internal.h"
>
> -int set_migratetype_isolate(struct page *page, bool skip_hwpoisoned_pages)
> +static int set_migratetype_isolate(struct page *page,
> + bool skip_hwpoisoned_pages)
> {
> struct zone *zone;
> unsigned long flags, pfn;
> @@ -72,7 +73,7 @@ int set_migratetype_isolate(struct page *page, bool skip_hwpoisoned_pages)
> return ret;
> }
>
> -void unset_migratetype_isolate(struct page *page, unsigned migratetype)
> +static void unset_migratetype_isolate(struct page *page, unsigned migratetype)
> {
> struct zone *zone;
> unsigned long flags, nr_pages;
>

2015-07-23 20:20:33

by David Rientjes

Subject: Re: [PATCH] mm, page_isolation: make set/unset_migratetype_isolate() file-local

On Thu, 23 Jul 2015, Naoya Horiguchi wrote:

> Nowaday, set/unset_migratetype_isolate() is defined and used only in
> mm/page_isolation, so let's limit the scope within the file.
>
> Signed-off-by: Naoya Horiguchi <[email protected]>

Acked-by: David Rientjes <[email protected]>