Re: [patch 16/20] non-reclaimable mlocked pages

[minchan Kim]

Hi, Rik.

There is a some trivial mistake.
It can cause compile error.

>@@ -665,7 +677,12 @@ static int prep_new_page(struct page *pa
>
> 	page->flags &= ~(1 << PG_uptodate | 1 << PG_error | 1 << PG_readahead |
> 			1 << PG_referenced | 1 << PG_arch_1 |
>-			1 << PG_owner_priv_1 | 1 << PG_mappedtodisk);
>+			1 << PG_owner_priv_1 | 1 << PG_mappedtodisk |
>+#ifdef CONFIG_NORECLAIM_MLOCK
>+//TODO take care of it here, for now.
>+			1 << PG_mlocked
>+#endif
>+			);
> 	set_page_private(page, 0);
> 	set_page_refcounted(page);

we need to fix it.

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 78c3f94..f6d535f 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -677,10 +677,10 @@ static int prep_new_page(struct page *page, int 
order, gfp_t gfp_flags)

  page->flags &= ~(1 << PG_uptodate | 1 << PG_error | 1 << PG_readahead |
      1 << PG_referenced | 1 << PG_arch_1 |
-     1 << PG_owner_priv_1 | 1 << PG_mappedtodisk |
+     1 << PG_owner_priv_1 | 1 << PG_mappedtodisk
 #ifdef CONFIG_NORECLAIM_MLOCK
 //TODO take care of it here, for now.
-     1 << PG_mlocked
+     | 1 << PG_mlocked
 #endif
      );
  set_page_private(page, 0);

Thanks,
barrios.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/