[mmotm 10 Oct][PATCH 1/2] fix build error of git-tip

[mmotm 10 Oct][PATCH 1/2] fix build error of git-tip

[KOSAKI Motohiro]

Patch name: git-tip-fix.patch
Patch against: mmotm 10 Oct
Applied after: git-tip.patch

-----------
git-tip can't build on ia64 because __acpi_unmap_table() function tyep is wrong.
Then it cause following build error.


  CC      arch/ia64/kernel/acpi.o
arch/ia64/kernel/acpi.c:180: error: conflicting types for '__acpi_unmap_table'
include/linux/acpi.h:82: error: previous declaration of '__acpi_unmap_table' was here
make[1]: *** [arch/ia64/kernel/acpi.o] Error 1
make: *** [arch/ia64/kernel] Error 2


Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
CC: Yinghai Lu <yhlu.kernel@gmail.com>
CC: Ingo Molnar <mingo@elte.hu>

---
 arch/ia64/kernel/acpi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: b/arch/ia64/kernel/acpi.c
===================================================================
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -176,7 +176,7 @@ char *__init __acpi_map_table(unsigned l
 	return __va(phys_addr);
 }
 
-char *__init __acpi_unmap_table(unsigned long virt_addr, unsigned long size)
+void __init __acpi_unmap_table(char *virt_addr, unsigned long size)
 {
 }
 

[mmotm 10 Oct][PATCH 2/2] fix build error of vmscan

[KOSAKI Motohiro]

Patch against: mmotm 10 Oct
Patch name: vmscan-fix-pagecache-reclaim-referenced-bit-check-fix-fix-fix.patch
Applied after: vmscan-fix-pagecache-reclaim-referenced-bit-check-fix-fix.patch


--------
vmscan-fix-pagecache-reclaim-referenced-bit-check-fix.patch introduce following build error.

  CC      mm/vmscan.o
mm/vmscan.c: In function 'shrink_active_list':
mm/vmscan.c:1248: error: too few arguments to function 'page_referenced'
make[1]: *** [mm/vmscan.o] Error 1
make: *** [mm] Error 2


Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
CC: Rik van Riel <riel@redhat.com>
CC: Andrew Morton <akpm@linux-foundation.org>

---
 mm/vmscan.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: b/mm/vmscan.c
===================================================================
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1245,7 +1245,8 @@ static void shrink_active_list(unsigned 
 		}
 
 		/* page_referenced clears PageReferenced */
-		if (page_mapping_inuse(page) && page_referenced(page))
+		if (page_mapping_inuse(page) &&
+		    page_referenced(page, 0, sc->mem_cgroup))
 			pgmoved++;
 
 		list_add(&page->lru, &l_inactive);

Re: [mmotm 10 Oct][PATCH 2/2] fix build error of vmscan

[Rik van Riel]

KOSAKI Motohiro wrote:

> Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
> CC: Rik van Riel <riel@redhat.com>
> CC: Andrew Morton <akpm@linux-foundation.org>

The disadvantage of programming-by-email :)

Acked-by: Rik van Riel <riel@redhat.com>

-- 
All rights reversed.

Re: [mmotm 10 Oct][PATCH 2/2] fix build error of vmscan

[Hugh Dickins]

On Sun, 12 Oct 2008, KOSAKI Motohiro wrote:
> 
> Patch against: mmotm 10 Oct
> Patch name: vmscan-fix-pagecache-reclaim-referenced-bit-check-fix-fix-fix.patch
> Applied after: vmscan-fix-pagecache-reclaim-referenced-bit-check-fix-fix.patch
> 
> 
> --------
> vmscan-fix-pagecache-reclaim-referenced-bit-check-fix.patch introduce following build error.
> 
>   CC      mm/vmscan.o
> mm/vmscan.c: In function 'shrink_active_list':
> mm/vmscan.c:1248: error: too few arguments to function 'page_referenced'
> make[1]: *** [mm/vmscan.o] Error 1
> make: *** [mm] Error 2
> 
> 
> Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
> CC: Rik van Riel <riel@redhat.com>
> CC: Andrew Morton <akpm@linux-foundation.org>

Excellent though it is, I'd prefer Andrew to ignore your patch:
because it falls within an unbisectable extent of the mmotm series,
for which I've now prepared a metapatch including this fix,
following in a minute or two.

Thanks,
Hugh

> 
> ---
>  mm/vmscan.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> Index: b/mm/vmscan.c
> ===================================================================
> --- a/mm/vmscan.c
> +++ b/mm/vmscan.c
> @@ -1245,7 +1245,8 @@ static void shrink_active_list(unsigned 
>  		}
>  
>  		/* page_referenced clears PageReferenced */
> -		if (page_mapping_inuse(page) && page_referenced(page))
> +		if (page_mapping_inuse(page) &&
> +		    page_referenced(page, 0, sc->mem_cgroup))
>  			pgmoved++;
>  
>  		list_add(&page->lru, &l_inactive);

Re: [mmotm 10 Oct][PATCH 1/2] fix build error of git-tip

[KOSAKI Motohiro]

Oops, I forgot to CCed Tony.
sorry.

> 
> Patch name: git-tip-fix.patch
> Patch against: mmotm 10 Oct
> Applied after: git-tip.patch
> 
> -----------
> git-tip can't build on ia64 because __acpi_unmap_table() function tyep is wrong.
> Then it cause following build error.
> 
> 
>   CC      arch/ia64/kernel/acpi.o
> arch/ia64/kernel/acpi.c:180: error: conflicting types for '__acpi_unmap_table'
> include/linux/acpi.h:82: error: previous declaration of '__acpi_unmap_table' was here
> make[1]: *** [arch/ia64/kernel/acpi.o] Error 1
> make: *** [arch/ia64/kernel] Error 2
> 
> 
> Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
> CC: Yinghai Lu <yhlu.kernel@gmail.com>
> CC: Ingo Molnar <mingo@elte.hu>
> 
> ---
>  arch/ia64/kernel/acpi.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: b/arch/ia64/kernel/acpi.c
> ===================================================================
> --- a/arch/ia64/kernel/acpi.c
> +++ b/arch/ia64/kernel/acpi.c
> @@ -176,7 +176,7 @@ char *__init __acpi_map_table(unsigned l
>  	return __va(phys_addr);
>  }
>  
> -char *__init __acpi_unmap_table(unsigned long virt_addr, unsigned long size)
> +void __init __acpi_unmap_table(char *virt_addr, unsigned long size)
>  {
>  }
>  
> 
>