diff for duplicates of <20160603010129.GC3304@bbox> diff --git a/a/1.txt b/N1/1.txt index 00a0a7d..81d5f16 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -39,3 +39,42 @@ Andrew, Please fold this patch into zsmalloc: page migration support. Thanks! + +>From 6b8fa9889b7892bdf5b2f01698310cfc766c4d17 Mon Sep 17 00:00:00 2001 +From: Minchan Kim <minchan@kernel.org> +Date: Fri, 3 Jun 2016 09:54:03 +0900 +Subject: [PATCH] zsmalloc: zspage sanity check + +The zsmalloc page migration is new feature so I want to catch any +corruption of zspage struct which is very critical to work +regardless of CONFIG_DEBUG_VM. + +Signed-off-by: Minchan Kim <minchan@kernel.org> +--- + mm/zsmalloc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c +index a80100db16d6..f75d2d134741 100644 +--- a/mm/zsmalloc.c ++++ b/mm/zsmalloc.c +@@ -523,7 +523,7 @@ static void get_zspage_mapping(struct zspage *zspage, + unsigned int *class_idx, + enum fullness_group *fullness) + { +- VM_BUG_ON(zspage->magic != ZSPAGE_MAGIC); ++ BUG_ON(zspage->magic != ZSPAGE_MAGIC); + + *fullness = zspage->fullness; + *class_idx = zspage->class; +@@ -857,7 +857,7 @@ static struct zspage *get_zspage(struct page *page) + { + struct zspage *zspage = (struct zspage *)page->private; + +- VM_BUG_ON(zspage->magic != ZSPAGE_MAGIC); ++ BUG_ON(zspage->magic != ZSPAGE_MAGIC); + return zspage; + } + +-- +1.9.1 diff --git a/a/content_digest b/N1/content_digest index 720d688..cda692d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,8 +3,8 @@ "Date\0Fri, 3 Jun 2016 10:01:29 +0900\0" "To\0Vlastimil Babka <vbabka@suse.cz>\0" "Cc\0Andrew Morton <akpm@linux-foundation.org>" - linux-mm@kvack.org - linux-kernel@vger.kernel.org + <linux-mm@kvack.org> + <linux-kernel@vger.kernel.org> " Sergey Senozhatsky <sergey.senozhatsky@gmail.com>\0" "\00:1\0" "b\0" @@ -48,6 +48,45 @@ "Andrew,\n" "\n" "Please fold this patch into zsmalloc: page migration support.\n" - Thanks! + "Thanks!\n" + "\n" + ">From 6b8fa9889b7892bdf5b2f01698310cfc766c4d17 Mon Sep 17 00:00:00 2001\n" + "From: Minchan Kim <minchan@kernel.org>\n" + "Date: Fri, 3 Jun 2016 09:54:03 +0900\n" + "Subject: [PATCH] zsmalloc: zspage sanity check\n" + "\n" + "The zsmalloc page migration is new feature so I want to catch any\n" + "corruption of zspage struct which is very critical to work\n" + "regardless of CONFIG_DEBUG_VM.\n" + "\n" + "Signed-off-by: Minchan Kim <minchan@kernel.org>\n" + "---\n" + " mm/zsmalloc.c | 4 ++--\n" + " 1 file changed, 2 insertions(+), 2 deletions(-)\n" + "\n" + "diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c\n" + "index a80100db16d6..f75d2d134741 100644\n" + "--- a/mm/zsmalloc.c\n" + "+++ b/mm/zsmalloc.c\n" + "@@ -523,7 +523,7 @@ static void get_zspage_mapping(struct zspage *zspage,\n" + " \t\t\t\tunsigned int *class_idx,\n" + " \t\t\t\tenum fullness_group *fullness)\n" + " {\n" + "-\tVM_BUG_ON(zspage->magic != ZSPAGE_MAGIC);\n" + "+\tBUG_ON(zspage->magic != ZSPAGE_MAGIC);\n" + " \n" + " \t*fullness = zspage->fullness;\n" + " \t*class_idx = zspage->class;\n" + "@@ -857,7 +857,7 @@ static struct zspage *get_zspage(struct page *page)\n" + " {\n" + " \tstruct zspage *zspage = (struct zspage *)page->private;\n" + " \n" + "-\tVM_BUG_ON(zspage->magic != ZSPAGE_MAGIC);\n" + "+\tBUG_ON(zspage->magic != ZSPAGE_MAGIC);\n" + " \treturn zspage;\n" + " }\n" + " \n" + "-- \n" + 1.9.1 -a10aac38bdb930b4ec4381e0e2f2ecf397aa6d0a4d48a9c5c6e8bce7727a3faf +7298f5ff62b6c65c92c37533b64c05c99ed67c34c0cc1b0f54c83637150cf32a
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.