diff for duplicates of <53996507.4040904@cn.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index ec7b5cb..d98c55e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -216,7 +216,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > - (unsigned long)limit, (unsigned long)alignment); > - > - /* Sanity checks */ -> - if (cma_area_count = ARRAY_SIZE(cma_areas)) { +> - if (cma_area_count == ARRAY_SIZE(cma_areas)) { > - pr_err("%s(): Not enough slots for CMA reserved regions!\n", > - __func__); > - return -ENOSPC; @@ -348,7 +348,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > - mutex_lock(&cma_mutex); > - ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA); > - mutex_unlock(&cma_mutex); -> - if (ret = 0) { +> - if (ret == 0) { > - page = pfn_to_page(pfn); > - break; > - } else if (ret != -EBUSY) { @@ -658,7 +658,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > + (unsigned long)limit, (unsigned long)alignment); > + > + /* Sanity checks */ -> + if (cma_area_count = ARRAY_SIZE(cma_areas)) { +> + if (cma_area_count == ARRAY_SIZE(cma_areas)) { > + pr_err("%s(): Not enough slots for CMA reserved regions!\n", > + __func__); > + return -ENOSPC; @@ -771,7 +771,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > + mutex_lock(&cma_mutex); > + ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA); > + mutex_unlock(&cma_mutex); -> + if (ret = 0) { +> + if (ret == 0) { > + page = pfn_to_page(pfn); > + break; > + } else if (ret != -EBUSY) { diff --git a/a/content_digest b/N1/content_digest index e17d028..ac245e3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,26 +2,25 @@ "ref\01402543307-29800-7-git-send-email-iamjoonsoo.kim@lge.com\0" "From\0Zhang Yanfei <zhangyanfei@cn.fujitsu.com>\0" "Subject\0Re: [PATCH v2 06/10] CMA: generalize CMA reserved area management functionality\0" - "Date\0Thu, 12 Jun 2014 08:29:59 +0000\0" + "Date\0Thu, 12 Jun 2014 16:29:59 +0800\0" "To\0Joonsoo Kim <iamjoonsoo.kim@lge.com>\0" - "Cc\0Andrew Morton <akpm@linux-foundation.org>" - Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> - Marek Szyprowski <m.szyprowski@samsung.com> - Michal Nazarewicz <mina86@mina86.com> - Minchan Kim <minchan@kernel.org> + "Cc\0kvm-ppc@vger.kernel.org" Russell King - ARM Linux <linux@arm.linux.org.uk> - Greg Kroah-Hartman <gregkh@linuxfoundation.org> - Paolo Bonzini <pbonzini@redhat.com> + kvm@vger.kernel.org + linux-mm@kvack.org Gleb Natapov <gleb@kernel.org> + Greg Kroah-Hartman <gregkh@linuxfoundation.org> Alexander Graf <agraf@suse.de> - Benjamin Herrenschmidt <benh@kernel.crashing.org> - Paul Mackerras <paulus@samba.org> - linux-mm@kvack.org + Michal Nazarewicz <mina86@mina86.com> linux-kernel@vger.kernel.org + Minchan Kim <minchan@kernel.org> + Paul Mackerras <paulus@samba.org> + Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> + Paolo Bonzini <pbonzini@redhat.com> + Andrew Morton <akpm@linux-foundation.org> + linuxppc-dev@lists.ozlabs.org linux-arm-kernel@lists.infradead.org - kvm@vger.kernel.org - kvm-ppc@vger.kernel.org - " linuxppc-dev@lists.ozlabs.org\0" + " Marek Szyprowski <m.szyprowski@samsung.com>\0" "\00:1\0" "b\0" "On 06/12/2014 11:21 AM, Joonsoo Kim wrote:\n" @@ -242,7 +241,7 @@ "> -\t\t(unsigned long)limit, (unsigned long)alignment);\n" "> -\n" "> -\t/* Sanity checks */\n" - "> -\tif (cma_area_count = ARRAY_SIZE(cma_areas)) {\n" + "> -\tif (cma_area_count == ARRAY_SIZE(cma_areas)) {\n" "> -\t\tpr_err(\"%s(): Not enough slots for CMA reserved regions!\\n\",\n" "> -\t\t\t__func__);\n" "> -\t\treturn -ENOSPC;\n" @@ -374,7 +373,7 @@ "> -\t\tmutex_lock(&cma_mutex);\n" "> -\t\tret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA);\n" "> -\t\tmutex_unlock(&cma_mutex);\n" - "> -\t\tif (ret = 0) {\n" + "> -\t\tif (ret == 0) {\n" "> -\t\t\tpage = pfn_to_page(pfn);\n" "> -\t\t\tbreak;\n" "> -\t\t} else if (ret != -EBUSY) {\n" @@ -684,7 +683,7 @@ "> +\t\t(unsigned long)limit, (unsigned long)alignment);\n" "> +\n" "> +\t/* Sanity checks */\n" - "> +\tif (cma_area_count = ARRAY_SIZE(cma_areas)) {\n" + "> +\tif (cma_area_count == ARRAY_SIZE(cma_areas)) {\n" "> +\t\tpr_err(\"%s(): Not enough slots for CMA reserved regions!\\n\",\n" "> +\t\t\t__func__);\n" "> +\t\treturn -ENOSPC;\n" @@ -797,7 +796,7 @@ "> +\t\tmutex_lock(&cma_mutex);\n" "> +\t\tret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA);\n" "> +\t\tmutex_unlock(&cma_mutex);\n" - "> +\t\tif (ret = 0) {\n" + "> +\t\tif (ret == 0) {\n" "> +\t\t\tpage = pfn_to_page(pfn);\n" "> +\t\t\tbreak;\n" "> +\t\t} else if (ret != -EBUSY) {\n" @@ -853,4 +852,4 @@ "Thanks.\n" Zhang Yanfei -702c22543243c54a4ab6377b3a2a03104a19b63e13036441e14c3c089f5f21da +c24668e56bd267db704cc7c0aa755f1b61863b319ffeb76fe99c56e4a97e7fc8
diff --git a/a/1.txt b/N2/1.txt index ec7b5cb..d98c55e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -216,7 +216,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > - (unsigned long)limit, (unsigned long)alignment); > - > - /* Sanity checks */ -> - if (cma_area_count = ARRAY_SIZE(cma_areas)) { +> - if (cma_area_count == ARRAY_SIZE(cma_areas)) { > - pr_err("%s(): Not enough slots for CMA reserved regions!\n", > - __func__); > - return -ENOSPC; @@ -348,7 +348,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > - mutex_lock(&cma_mutex); > - ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA); > - mutex_unlock(&cma_mutex); -> - if (ret = 0) { +> - if (ret == 0) { > - page = pfn_to_page(pfn); > - break; > - } else if (ret != -EBUSY) { @@ -658,7 +658,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > + (unsigned long)limit, (unsigned long)alignment); > + > + /* Sanity checks */ -> + if (cma_area_count = ARRAY_SIZE(cma_areas)) { +> + if (cma_area_count == ARRAY_SIZE(cma_areas)) { > + pr_err("%s(): Not enough slots for CMA reserved regions!\n", > + __func__); > + return -ENOSPC; @@ -771,7 +771,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > + mutex_lock(&cma_mutex); > + ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA); > + mutex_unlock(&cma_mutex); -> + if (ret = 0) { +> + if (ret == 0) { > + page = pfn_to_page(pfn); > + break; > + } else if (ret != -EBUSY) { diff --git a/a/content_digest b/N2/content_digest index e17d028..b5d207d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,27 +1,9 @@ "ref\01402543307-29800-1-git-send-email-iamjoonsoo.kim@lge.com\0" "ref\01402543307-29800-7-git-send-email-iamjoonsoo.kim@lge.com\0" - "From\0Zhang Yanfei <zhangyanfei@cn.fujitsu.com>\0" - "Subject\0Re: [PATCH v2 06/10] CMA: generalize CMA reserved area management functionality\0" - "Date\0Thu, 12 Jun 2014 08:29:59 +0000\0" - "To\0Joonsoo Kim <iamjoonsoo.kim@lge.com>\0" - "Cc\0Andrew Morton <akpm@linux-foundation.org>" - Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> - Marek Szyprowski <m.szyprowski@samsung.com> - Michal Nazarewicz <mina86@mina86.com> - Minchan Kim <minchan@kernel.org> - Russell King - ARM Linux <linux@arm.linux.org.uk> - Greg Kroah-Hartman <gregkh@linuxfoundation.org> - Paolo Bonzini <pbonzini@redhat.com> - Gleb Natapov <gleb@kernel.org> - Alexander Graf <agraf@suse.de> - Benjamin Herrenschmidt <benh@kernel.crashing.org> - Paul Mackerras <paulus@samba.org> - linux-mm@kvack.org - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org - kvm@vger.kernel.org - kvm-ppc@vger.kernel.org - " linuxppc-dev@lists.ozlabs.org\0" + "From\0zhangyanfei@cn.fujitsu.com (Zhang Yanfei)\0" + "Subject\0[PATCH v2 06/10] CMA: generalize CMA reserved area management functionality\0" + "Date\0Thu, 12 Jun 2014 16:29:59 +0800\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 06/12/2014 11:21 AM, Joonsoo Kim wrote:\n" @@ -242,7 +224,7 @@ "> -\t\t(unsigned long)limit, (unsigned long)alignment);\n" "> -\n" "> -\t/* Sanity checks */\n" - "> -\tif (cma_area_count = ARRAY_SIZE(cma_areas)) {\n" + "> -\tif (cma_area_count == ARRAY_SIZE(cma_areas)) {\n" "> -\t\tpr_err(\"%s(): Not enough slots for CMA reserved regions!\\n\",\n" "> -\t\t\t__func__);\n" "> -\t\treturn -ENOSPC;\n" @@ -374,7 +356,7 @@ "> -\t\tmutex_lock(&cma_mutex);\n" "> -\t\tret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA);\n" "> -\t\tmutex_unlock(&cma_mutex);\n" - "> -\t\tif (ret = 0) {\n" + "> -\t\tif (ret == 0) {\n" "> -\t\t\tpage = pfn_to_page(pfn);\n" "> -\t\t\tbreak;\n" "> -\t\t} else if (ret != -EBUSY) {\n" @@ -684,7 +666,7 @@ "> +\t\t(unsigned long)limit, (unsigned long)alignment);\n" "> +\n" "> +\t/* Sanity checks */\n" - "> +\tif (cma_area_count = ARRAY_SIZE(cma_areas)) {\n" + "> +\tif (cma_area_count == ARRAY_SIZE(cma_areas)) {\n" "> +\t\tpr_err(\"%s(): Not enough slots for CMA reserved regions!\\n\",\n" "> +\t\t\t__func__);\n" "> +\t\treturn -ENOSPC;\n" @@ -797,7 +779,7 @@ "> +\t\tmutex_lock(&cma_mutex);\n" "> +\t\tret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA);\n" "> +\t\tmutex_unlock(&cma_mutex);\n" - "> +\t\tif (ret = 0) {\n" + "> +\t\tif (ret == 0) {\n" "> +\t\t\tpage = pfn_to_page(pfn);\n" "> +\t\t\tbreak;\n" "> +\t\t} else if (ret != -EBUSY) {\n" @@ -853,4 +835,4 @@ "Thanks.\n" Zhang Yanfei -702c22543243c54a4ab6377b3a2a03104a19b63e13036441e14c3c089f5f21da +a039c5debb7bb08fbefb5fdcd1768e0fdf9a656c4b701e6b44e64f55ffebb707
diff --git a/a/1.txt b/N3/1.txt index ec7b5cb..a0607ac 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -216,7 +216,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > - (unsigned long)limit, (unsigned long)alignment); > - > - /* Sanity checks */ -> - if (cma_area_count = ARRAY_SIZE(cma_areas)) { +> - if (cma_area_count == ARRAY_SIZE(cma_areas)) { > - pr_err("%s(): Not enough slots for CMA reserved regions!\n", > - __func__); > - return -ENOSPC; @@ -348,7 +348,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > - mutex_lock(&cma_mutex); > - ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA); > - mutex_unlock(&cma_mutex); -> - if (ret = 0) { +> - if (ret == 0) { > - page = pfn_to_page(pfn); > - break; > - } else if (ret != -EBUSY) { @@ -658,7 +658,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > + (unsigned long)limit, (unsigned long)alignment); > + > + /* Sanity checks */ -> + if (cma_area_count = ARRAY_SIZE(cma_areas)) { +> + if (cma_area_count == ARRAY_SIZE(cma_areas)) { > + pr_err("%s(): Not enough slots for CMA reserved regions!\n", > + __func__); > + return -ENOSPC; @@ -771,7 +771,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > + mutex_lock(&cma_mutex); > + ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA); > + mutex_unlock(&cma_mutex); -> + if (ret = 0) { +> + if (ret == 0) { > + page = pfn_to_page(pfn); > + break; > + } else if (ret != -EBUSY) { @@ -826,3 +826,9 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> -- Thanks. Zhang Yanfei + +-- +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/ . +Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N3/content_digest index e17d028..ba8a808 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -2,7 +2,7 @@ "ref\01402543307-29800-7-git-send-email-iamjoonsoo.kim@lge.com\0" "From\0Zhang Yanfei <zhangyanfei@cn.fujitsu.com>\0" "Subject\0Re: [PATCH v2 06/10] CMA: generalize CMA reserved area management functionality\0" - "Date\0Thu, 12 Jun 2014 08:29:59 +0000\0" + "Date\0Thu, 12 Jun 2014 16:29:59 +0800\0" "To\0Joonsoo Kim <iamjoonsoo.kim@lge.com>\0" "Cc\0Andrew Morton <akpm@linux-foundation.org>" Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> @@ -16,12 +16,12 @@ Alexander Graf <agraf@suse.de> Benjamin Herrenschmidt <benh@kernel.crashing.org> Paul Mackerras <paulus@samba.org> - linux-mm@kvack.org - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org - kvm@vger.kernel.org - kvm-ppc@vger.kernel.org - " linuxppc-dev@lists.ozlabs.org\0" + <linux-mm@kvack.org> + <linux-kernel@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + <kvm@vger.kernel.org> + <kvm-ppc@vger.kernel.org> + " <linuxppc-dev@lists.ozlabs.org>\0" "\00:1\0" "b\0" "On 06/12/2014 11:21 AM, Joonsoo Kim wrote:\n" @@ -242,7 +242,7 @@ "> -\t\t(unsigned long)limit, (unsigned long)alignment);\n" "> -\n" "> -\t/* Sanity checks */\n" - "> -\tif (cma_area_count = ARRAY_SIZE(cma_areas)) {\n" + "> -\tif (cma_area_count == ARRAY_SIZE(cma_areas)) {\n" "> -\t\tpr_err(\"%s(): Not enough slots for CMA reserved regions!\\n\",\n" "> -\t\t\t__func__);\n" "> -\t\treturn -ENOSPC;\n" @@ -374,7 +374,7 @@ "> -\t\tmutex_lock(&cma_mutex);\n" "> -\t\tret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA);\n" "> -\t\tmutex_unlock(&cma_mutex);\n" - "> -\t\tif (ret = 0) {\n" + "> -\t\tif (ret == 0) {\n" "> -\t\t\tpage = pfn_to_page(pfn);\n" "> -\t\t\tbreak;\n" "> -\t\t} else if (ret != -EBUSY) {\n" @@ -684,7 +684,7 @@ "> +\t\t(unsigned long)limit, (unsigned long)alignment);\n" "> +\n" "> +\t/* Sanity checks */\n" - "> +\tif (cma_area_count = ARRAY_SIZE(cma_areas)) {\n" + "> +\tif (cma_area_count == ARRAY_SIZE(cma_areas)) {\n" "> +\t\tpr_err(\"%s(): Not enough slots for CMA reserved regions!\\n\",\n" "> +\t\t\t__func__);\n" "> +\t\treturn -ENOSPC;\n" @@ -797,7 +797,7 @@ "> +\t\tmutex_lock(&cma_mutex);\n" "> +\t\tret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA);\n" "> +\t\tmutex_unlock(&cma_mutex);\n" - "> +\t\tif (ret = 0) {\n" + "> +\t\tif (ret == 0) {\n" "> +\t\t\tpage = pfn_to_page(pfn);\n" "> +\t\t\tbreak;\n" "> +\t\t} else if (ret != -EBUSY) {\n" @@ -851,6 +851,12 @@ "\n" "-- \n" "Thanks.\n" - Zhang Yanfei + "Zhang Yanfei\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" + "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -702c22543243c54a4ab6377b3a2a03104a19b63e13036441e14c3c089f5f21da +7e71dcc97badba2edc792048995769684fda793fd2f22837326ad3510b479199
diff --git a/a/1.txt b/N4/1.txt index ec7b5cb..a0607ac 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -216,7 +216,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > - (unsigned long)limit, (unsigned long)alignment); > - > - /* Sanity checks */ -> - if (cma_area_count = ARRAY_SIZE(cma_areas)) { +> - if (cma_area_count == ARRAY_SIZE(cma_areas)) { > - pr_err("%s(): Not enough slots for CMA reserved regions!\n", > - __func__); > - return -ENOSPC; @@ -348,7 +348,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > - mutex_lock(&cma_mutex); > - ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA); > - mutex_unlock(&cma_mutex); -> - if (ret = 0) { +> - if (ret == 0) { > - page = pfn_to_page(pfn); > - break; > - } else if (ret != -EBUSY) { @@ -658,7 +658,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > + (unsigned long)limit, (unsigned long)alignment); > + > + /* Sanity checks */ -> + if (cma_area_count = ARRAY_SIZE(cma_areas)) { +> + if (cma_area_count == ARRAY_SIZE(cma_areas)) { > + pr_err("%s(): Not enough slots for CMA reserved regions!\n", > + __func__); > + return -ENOSPC; @@ -771,7 +771,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > + mutex_lock(&cma_mutex); > + ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA); > + mutex_unlock(&cma_mutex); -> + if (ret = 0) { +> + if (ret == 0) { > + page = pfn_to_page(pfn); > + break; > + } else if (ret != -EBUSY) { @@ -826,3 +826,9 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> -- Thanks. Zhang Yanfei + +-- +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/ . +Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N4/content_digest index e17d028..91f283e 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -2,7 +2,7 @@ "ref\01402543307-29800-7-git-send-email-iamjoonsoo.kim@lge.com\0" "From\0Zhang Yanfei <zhangyanfei@cn.fujitsu.com>\0" "Subject\0Re: [PATCH v2 06/10] CMA: generalize CMA reserved area management functionality\0" - "Date\0Thu, 12 Jun 2014 08:29:59 +0000\0" + "Date\0Thu, 12 Jun 2014 16:29:59 +0800\0" "To\0Joonsoo Kim <iamjoonsoo.kim@lge.com>\0" "Cc\0Andrew Morton <akpm@linux-foundation.org>" Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> @@ -242,7 +242,7 @@ "> -\t\t(unsigned long)limit, (unsigned long)alignment);\n" "> -\n" "> -\t/* Sanity checks */\n" - "> -\tif (cma_area_count = ARRAY_SIZE(cma_areas)) {\n" + "> -\tif (cma_area_count == ARRAY_SIZE(cma_areas)) {\n" "> -\t\tpr_err(\"%s(): Not enough slots for CMA reserved regions!\\n\",\n" "> -\t\t\t__func__);\n" "> -\t\treturn -ENOSPC;\n" @@ -374,7 +374,7 @@ "> -\t\tmutex_lock(&cma_mutex);\n" "> -\t\tret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA);\n" "> -\t\tmutex_unlock(&cma_mutex);\n" - "> -\t\tif (ret = 0) {\n" + "> -\t\tif (ret == 0) {\n" "> -\t\t\tpage = pfn_to_page(pfn);\n" "> -\t\t\tbreak;\n" "> -\t\t} else if (ret != -EBUSY) {\n" @@ -684,7 +684,7 @@ "> +\t\t(unsigned long)limit, (unsigned long)alignment);\n" "> +\n" "> +\t/* Sanity checks */\n" - "> +\tif (cma_area_count = ARRAY_SIZE(cma_areas)) {\n" + "> +\tif (cma_area_count == ARRAY_SIZE(cma_areas)) {\n" "> +\t\tpr_err(\"%s(): Not enough slots for CMA reserved regions!\\n\",\n" "> +\t\t\t__func__);\n" "> +\t\treturn -ENOSPC;\n" @@ -797,7 +797,7 @@ "> +\t\tmutex_lock(&cma_mutex);\n" "> +\t\tret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA);\n" "> +\t\tmutex_unlock(&cma_mutex);\n" - "> +\t\tif (ret = 0) {\n" + "> +\t\tif (ret == 0) {\n" "> +\t\t\tpage = pfn_to_page(pfn);\n" "> +\t\t\tbreak;\n" "> +\t\t} else if (ret != -EBUSY) {\n" @@ -851,6 +851,12 @@ "\n" "-- \n" "Thanks.\n" - Zhang Yanfei + "Zhang Yanfei\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" + "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -702c22543243c54a4ab6377b3a2a03104a19b63e13036441e14c3c089f5f21da +f006d37f6c93f387a75b0fa997908022666ac95d35826e414cb5b2c90e0a1002
diff --git a/a/1.txt b/N5/1.txt index ec7b5cb..d98c55e 100644 --- a/a/1.txt +++ b/N5/1.txt @@ -216,7 +216,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > - (unsigned long)limit, (unsigned long)alignment); > - > - /* Sanity checks */ -> - if (cma_area_count = ARRAY_SIZE(cma_areas)) { +> - if (cma_area_count == ARRAY_SIZE(cma_areas)) { > - pr_err("%s(): Not enough slots for CMA reserved regions!\n", > - __func__); > - return -ENOSPC; @@ -348,7 +348,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > - mutex_lock(&cma_mutex); > - ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA); > - mutex_unlock(&cma_mutex); -> - if (ret = 0) { +> - if (ret == 0) { > - page = pfn_to_page(pfn); > - break; > - } else if (ret != -EBUSY) { @@ -658,7 +658,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > + (unsigned long)limit, (unsigned long)alignment); > + > + /* Sanity checks */ -> + if (cma_area_count = ARRAY_SIZE(cma_areas)) { +> + if (cma_area_count == ARRAY_SIZE(cma_areas)) { > + pr_err("%s(): Not enough slots for CMA reserved regions!\n", > + __func__); > + return -ENOSPC; @@ -771,7 +771,7 @@ Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> > + mutex_lock(&cma_mutex); > + ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA); > + mutex_unlock(&cma_mutex); -> + if (ret = 0) { +> + if (ret == 0) { > + page = pfn_to_page(pfn); > + break; > + } else if (ret != -EBUSY) { diff --git a/a/content_digest b/N5/content_digest index e17d028..aa217d6 100644 --- a/a/content_digest +++ b/N5/content_digest @@ -2,7 +2,7 @@ "ref\01402543307-29800-7-git-send-email-iamjoonsoo.kim@lge.com\0" "From\0Zhang Yanfei <zhangyanfei@cn.fujitsu.com>\0" "Subject\0Re: [PATCH v2 06/10] CMA: generalize CMA reserved area management functionality\0" - "Date\0Thu, 12 Jun 2014 08:29:59 +0000\0" + "Date\0Thu, 12 Jun 2014 16:29:59 +0800\0" "To\0Joonsoo Kim <iamjoonsoo.kim@lge.com>\0" "Cc\0Andrew Morton <akpm@linux-foundation.org>" Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> @@ -16,12 +16,12 @@ Alexander Graf <agraf@suse.de> Benjamin Herrenschmidt <benh@kernel.crashing.org> Paul Mackerras <paulus@samba.org> - linux-mm@kvack.org - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org - kvm@vger.kernel.org - kvm-ppc@vger.kernel.org - " linuxppc-dev@lists.ozlabs.org\0" + <linux-mm@kvack.org> + <linux-kernel@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + <kvm@vger.kernel.org> + <kvm-ppc@vger.kernel.org> + " <linuxppc-dev@lists.ozlabs.org>\0" "\00:1\0" "b\0" "On 06/12/2014 11:21 AM, Joonsoo Kim wrote:\n" @@ -242,7 +242,7 @@ "> -\t\t(unsigned long)limit, (unsigned long)alignment);\n" "> -\n" "> -\t/* Sanity checks */\n" - "> -\tif (cma_area_count = ARRAY_SIZE(cma_areas)) {\n" + "> -\tif (cma_area_count == ARRAY_SIZE(cma_areas)) {\n" "> -\t\tpr_err(\"%s(): Not enough slots for CMA reserved regions!\\n\",\n" "> -\t\t\t__func__);\n" "> -\t\treturn -ENOSPC;\n" @@ -374,7 +374,7 @@ "> -\t\tmutex_lock(&cma_mutex);\n" "> -\t\tret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA);\n" "> -\t\tmutex_unlock(&cma_mutex);\n" - "> -\t\tif (ret = 0) {\n" + "> -\t\tif (ret == 0) {\n" "> -\t\t\tpage = pfn_to_page(pfn);\n" "> -\t\t\tbreak;\n" "> -\t\t} else if (ret != -EBUSY) {\n" @@ -684,7 +684,7 @@ "> +\t\t(unsigned long)limit, (unsigned long)alignment);\n" "> +\n" "> +\t/* Sanity checks */\n" - "> +\tif (cma_area_count = ARRAY_SIZE(cma_areas)) {\n" + "> +\tif (cma_area_count == ARRAY_SIZE(cma_areas)) {\n" "> +\t\tpr_err(\"%s(): Not enough slots for CMA reserved regions!\\n\",\n" "> +\t\t\t__func__);\n" "> +\t\treturn -ENOSPC;\n" @@ -797,7 +797,7 @@ "> +\t\tmutex_lock(&cma_mutex);\n" "> +\t\tret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA);\n" "> +\t\tmutex_unlock(&cma_mutex);\n" - "> +\t\tif (ret = 0) {\n" + "> +\t\tif (ret == 0) {\n" "> +\t\t\tpage = pfn_to_page(pfn);\n" "> +\t\t\tbreak;\n" "> +\t\t} else if (ret != -EBUSY) {\n" @@ -853,4 +853,4 @@ "Thanks.\n" Zhang Yanfei -702c22543243c54a4ab6377b3a2a03104a19b63e13036441e14c3c089f5f21da +88914b032e51e59f9935c4442d06e7873d7cbd37abd31051fc9186e540dc96ba
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.