diff for duplicates of <201103181529.43659.nai.xia@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 2b9d6cd..5386596 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,7 +18,7 @@ Thanks, > +++ a/mm/ksm.c > @@ -883,7 +883,6 @@ static int try_to_merge_one_page(struct > */ -> if (write_protect_page(vma, page, &orig_pte) = 0) { +> if (write_protect_page(vma, page, &orig_pte) == 0) { > if (!kpage) { > - long mapcount = page_mapcount(page); > /* diff --git a/a/content_digest b/N1/content_digest index 39b7e66..c65f8ea 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020110302143142.a3c0002b.akpm@linux-foundation.org\0" "From\0Nai Xia <nai.xia@gmail.com>\0" "Subject\0Re: [PATCH] ksm: add vm_stat and meminfo entry to reflect pte mapping to ksm pages\0" - "Date\0Fri, 18 Mar 2011 07:29:43 +0000\0" + "Date\0Fri, 18 Mar 2011 15:29:43 +0800\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" "Cc\0Izik Eidus <ieidus@redhat.com>" Hugh Dickins <hugh.dickins@tiscali.co.uk> @@ -34,7 +34,7 @@ "> +++ a/mm/ksm.c\n" "> @@ -883,7 +883,6 @@ static int try_to_merge_one_page(struct \n" "> \t */\n" - "> \tif (write_protect_page(vma, page, &orig_pte) = 0) {\n" + "> \tif (write_protect_page(vma, page, &orig_pte) == 0) {\n" "> \t\tif (!kpage) {\n" "> -\t\t\tlong mapcount = page_mapcount(page);\n" "> \t\t\t/*\n" @@ -99,4 +99,4 @@ "> \n" > -2b8bfc23dacd9343da9c168f0958678df92664f29f633a45c024ddc2bce812e6 +957a0723f63c179c28f8fc8c5b8cd32be6eda59872ba7314fbbbec4f63dc486e
diff --git a/a/1.txt b/N2/1.txt index 2b9d6cd..3ceb2b1 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -18,7 +18,7 @@ Thanks, > +++ a/mm/ksm.c > @@ -883,7 +883,6 @@ static int try_to_merge_one_page(struct > */ -> if (write_protect_page(vma, page, &orig_pte) = 0) { +> if (write_protect_page(vma, page, &orig_pte) == 0) { > if (!kpage) { > - long mapcount = page_mapcount(page); > /* @@ -81,4 +81,11 @@ Thanks, > return; > _ > -> +> + +-- +To unsubscribe, send a message with 'unsubscribe linux-mm' in +the body to majordomo@kvack.org. For more info on Linux MM, +see: http://www.linux-mm.org/ . +Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ +Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N2/content_digest index 39b7e66..752509f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\020110302143142.a3c0002b.akpm@linux-foundation.org\0" "From\0Nai Xia <nai.xia@gmail.com>\0" "Subject\0Re: [PATCH] ksm: add vm_stat and meminfo entry to reflect pte mapping to ksm pages\0" - "Date\0Fri, 18 Mar 2011 07:29:43 +0000\0" + "Date\0Fri, 18 Mar 2011 15:29:43 +0800\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" "Cc\0Izik Eidus <ieidus@redhat.com>" Hugh Dickins <hugh.dickins@tiscali.co.uk> @@ -34,7 +34,7 @@ "> +++ a/mm/ksm.c\n" "> @@ -883,7 +883,6 @@ static int try_to_merge_one_page(struct \n" "> \t */\n" - "> \tif (write_protect_page(vma, page, &orig_pte) = 0) {\n" + "> \tif (write_protect_page(vma, page, &orig_pte) == 0) {\n" "> \t\tif (!kpage) {\n" "> -\t\t\tlong mapcount = page_mapcount(page);\n" "> \t\t\t/*\n" @@ -97,6 +97,13 @@ "> \t\treturn;\n" "> _\n" "> \n" - > + "> \n" + "\n" + "--\n" + "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" + "the body to majordomo@kvack.org. For more info on Linux MM,\n" + "see: http://www.linux-mm.org/ .\n" + "Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/\n" + "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -2b8bfc23dacd9343da9c168f0958678df92664f29f633a45c024ddc2bce812e6 +14a7cada38e6d9a95f15744e0ef45e554273bddd5b9f220c02f46c8cdcc37a30
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.