diff for duplicates of <1548057848-15136-10-git-send-email-rppt@linux.ibm.com>
diff --git a/a/1.txt b/N1/1.txt
index 3903b81..6c1537d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -76,7 +76,7 @@ index 0a0b8e1..42cf68d 100644
*/
- smu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL);
+ smu_cmdbuf_abs = memblock_phys_alloc_range(4096, 4096, 0, 0x80000000UL);
- if (smu_cmdbuf_abs = 0) {
+ if (smu_cmdbuf_abs == 0) {
printk(KERN_ERR "SMU: Command buffer allocation failed !\n");
ret = -EINVAL;
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
@@ -107,7 +107,7 @@ index e5ffdcd..531fa77 100644
- alloc = memblock_alloc_range_nid(size, align, 0, max_addr, NUMA_NO_NODE,
- MEMBLOCK_NONE);
-
-- if (alloc = 0)
+- if (alloc == 0)
- panic("ERROR: Failed to allocate %pa bytes below %pa.\n",
- &size, &max_addr);
-
diff --git a/a/content_digest b/N1/content_digest
index 6450efa..2fa3f90 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,60 +8,60 @@
"Subject\0[PATCH v2 09/21] memblock: drop memblock_alloc_base()\0"
]
[
- "Date\0Mon, 21 Jan 2019 08:03:56 +0000\0"
+ "Date\0Mon, 21 Jan 2019 10:03:56 +0200\0"
]
[
"To\0linux-mm\@kvack.org\0"
]
[
- "Cc\0Rich Felker <dalias\@libc.org>",
- " linux-ia64\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
+ "Cc\0Andrew Morton <akpm\@linux-foundation.org>",
" Catalin Marinas <catalin.marinas\@arm.com>",
- " Heiko Carstens <heiko.carstens\@de.ibm.com>",
- " x86\@kernel.org",
- " linux-mips\@vger.kernel.org",
- " Max Filippov <jcmvbkbc\@gmail.com>",
- " Guo Ren <guoren\@kernel.org>",
- " sparclinux\@vger.kernel.org",
" Christoph Hellwig <hch\@lst.de>",
- " linux-s390\@vger.kernel.org",
- " linux-c6x-dev\@linux-c6x.org",
- " Yoshinori Sato <ysato\@users.sourceforge.jp>",
- " Richard Weinberger <richard\@nod.at>",
- " linux-sh\@vger.kernel.org",
- " Russell King <linux\@armlinux.org.uk>",
- " kasan-dev\@googlegroups.com",
- " Mike Rapoport <rppt\@linux.ibm.com>",
+ " David S. Miller <davem\@davemloft.net>",
+ " Dennis Zhou <dennis\@kernel.org>",
" Geert Uytterhoeven <geert\@linux-m68k.org>",
+ " Greentime Hu <green.hu\@gmail.com>",
+ " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
+ " Guan Xuetao <gxt\@pku.edu.cn>",
+ " Guo Ren <guoren\@kernel.org>",
+ " Heiko Carstens <heiko.carstens\@de.ibm.com>",
" Mark Salter <msalter\@redhat.com>",
- " Dennis Zhou <dennis\@kernel.org>",
" Matt Turner <mattst88\@gmail.com>",
- " linux-snps-arc\@lists.infradead.org",
- " uclinux-h8-devel\@lists.sourceforge.jp",
+ " Max Filippov <jcmvbkbc\@gmail.com>",
+ " Michael Ellerman <mpe\@ellerman.id.au>",
+ " Michal Simek <monstr\@monstr.eu>",
+ " Paul Burton <paul.burton\@mips.com>",
" Petr Mladek <pmladek\@suse.com>",
- " linux-xtensa\@linux-xtensa.org",
- " linux-alpha\@vger.kernel.org",
- " linux-um\@lists.infradead.org",
- " linux-m68k\@lists.linux-m68k.org",
+ " Rich Felker <dalias\@libc.org>",
+ " Richard Weinberger <richard\@nod.at>",
" Rob Herring <robh+dt\@kernel.org>",
- " Greentime Hu <green.hu\@gmail.com>",
- " xen-devel\@lists.xenproject.org",
+ " Russell King <linux\@armlinux.org.uk>",
" Stafford Horne <shorne\@gmail.com>",
- " Guan Xuetao <gxt\@pku.edu.cn>",
- " linux-arm-kernel\@lists.infradead.org",
- " Michal Simek <monstr\@monstr.eu>",
" Tony Luck <tony.luck\@intel.com>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " linux-usb\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " Paul Burton <paul.burton\@mips.com>",
" Vineet Gupta <vgupta\@synopsys.com>",
- " Michael Ellerman <mpe\@ellerman.id.au>",
- " Andrew Morton <akpm\@linux-foundation.org>",
+ " Yoshinori Sato <ysato\@users.sourceforge.jp>",
+ " devicetree\@vger.kernel.org",
+ " kasan-dev\@googlegroups.com",
+ " linux-alpha\@vger.kernel.org",
+ " linux-arm-kernel\@lists.infradead.org",
+ " linux-c6x-dev\@linux-c6x.org",
+ " linux-ia64\@vger.kernel.org",
+ " linux-kernel\@vger.kernel.org",
+ " linux-m68k\@lists.linux-m68k.org",
+ " linux-mips\@vger.kernel.org",
+ " linux-s390\@vger.kernel.org",
+ " linux-sh\@vger.kernel.org",
+ " linux-snps-arc\@lists.infradead.org",
+ " linux-um\@lists.infradead.org",
+ " linux-usb\@vger.kernel.org",
+ " linux-xtensa\@linux-xtensa.org",
" linuxppc-dev\@lists.ozlabs.org",
- " David S. Miller <davem\@davemloft.net>",
- " openrisc\@lists.librecores.org\0"
+ " openrisc\@lists.librecores.org",
+ " sparclinux\@vger.kernel.org",
+ " uclinux-h8-devel\@lists.sourceforge.jp",
+ " x86\@kernel.org",
+ " xen-devel\@lists.xenproject.org",
+ " Mike Rapoport <rppt\@linux.ibm.com>\0"
]
[
"\0000:1\0"
@@ -148,7 +148,7 @@
" \t */\n",
"-\tsmu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL);\n",
"+\tsmu_cmdbuf_abs = memblock_phys_alloc_range(4096, 4096, 0, 0x80000000UL);\n",
- " \tif (smu_cmdbuf_abs = 0) {\n",
+ " \tif (smu_cmdbuf_abs == 0) {\n",
" \t\tprintk(KERN_ERR \"SMU: Command buffer allocation failed !\\n\");\n",
" \t\tret = -EINVAL;\n",
"diff --git a/include/linux/memblock.h b/include/linux/memblock.h\n",
@@ -179,7 +179,7 @@
"-\talloc = memblock_alloc_range_nid(size, align, 0, max_addr, NUMA_NO_NODE,\n",
"-\t\t\t\t\tMEMBLOCK_NONE);\n",
"-\n",
- "-\tif (alloc = 0)\n",
+ "-\tif (alloc == 0)\n",
"-\t\tpanic(\"ERROR: Failed to allocate %pa bytes below %pa.\\n\",\n",
"-\t\t &size, &max_addr);\n",
"-\n",
@@ -193,4 +193,4 @@
"2.7.4"
]
-48053bf7aa24cf04b9e2e88d4e100140c941c7dbebaf4ac2a1db258ad3613fcf
+fd95b4cac018fa14496eb9d59a280b8829901c77b2042614562629a0abd702a6
diff --git a/a/1.txt b/N2/1.txt
index 3903b81..6f72554 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -76,7 +76,7 @@ index 0a0b8e1..42cf68d 100644
*/
- smu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL);
+ smu_cmdbuf_abs = memblock_phys_alloc_range(4096, 4096, 0, 0x80000000UL);
- if (smu_cmdbuf_abs = 0) {
+ if (smu_cmdbuf_abs == 0) {
printk(KERN_ERR "SMU: Command buffer allocation failed !\n");
ret = -EINVAL;
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
@@ -107,7 +107,7 @@ index e5ffdcd..531fa77 100644
- alloc = memblock_alloc_range_nid(size, align, 0, max_addr, NUMA_NO_NODE,
- MEMBLOCK_NONE);
-
-- if (alloc = 0)
+- if (alloc == 0)
- panic("ERROR: Failed to allocate %pa bytes below %pa.\n",
- &size, &max_addr);
-
@@ -118,4 +118,10 @@ index e5ffdcd..531fa77 100644
{
phys_addr_t res = memblock_phys_alloc_nid(size, align, nid);
--
-2.7.4
\ No newline at end of file
+2.7.4
+
+
+_______________________________________________
+linux-arm-kernel mailing list
+linux-arm-kernel@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index 6450efa..d3c2ba1 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v2 09/21] memblock: drop memblock_alloc_base()\0"
]
[
- "Date\0Mon, 21 Jan 2019 08:03:56 +0000\0"
+ "Date\0Mon, 21 Jan 2019 10:03:56 +0200\0"
]
[
"To\0linux-mm\@kvack.org\0"
@@ -148,7 +148,7 @@
" \t */\n",
"-\tsmu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL);\n",
"+\tsmu_cmdbuf_abs = memblock_phys_alloc_range(4096, 4096, 0, 0x80000000UL);\n",
- " \tif (smu_cmdbuf_abs = 0) {\n",
+ " \tif (smu_cmdbuf_abs == 0) {\n",
" \t\tprintk(KERN_ERR \"SMU: Command buffer allocation failed !\\n\");\n",
" \t\tret = -EINVAL;\n",
"diff --git a/include/linux/memblock.h b/include/linux/memblock.h\n",
@@ -179,7 +179,7 @@
"-\talloc = memblock_alloc_range_nid(size, align, 0, max_addr, NUMA_NO_NODE,\n",
"-\t\t\t\t\tMEMBLOCK_NONE);\n",
"-\n",
- "-\tif (alloc = 0)\n",
+ "-\tif (alloc == 0)\n",
"-\t\tpanic(\"ERROR: Failed to allocate %pa bytes below %pa.\\n\",\n",
"-\t\t &size, &max_addr);\n",
"-\n",
@@ -190,7 +190,13 @@
" {\n",
" \tphys_addr_t res = memblock_phys_alloc_nid(size, align, nid);\n",
"-- \n",
- "2.7.4"
+ "2.7.4\n",
+ "\n",
+ "\n",
+ "_______________________________________________\n",
+ "linux-arm-kernel mailing list\n",
+ "linux-arm-kernel\@lists.infradead.org\n",
+ "http://lists.infradead.org/mailman/listinfo/linux-arm-kernel"
]
-48053bf7aa24cf04b9e2e88d4e100140c941c7dbebaf4ac2a1db258ad3613fcf
+9e42269400b8d434215d8c457c8eff9c5db909cd28bb7daa24393832d00fefcb
diff --git a/a/1.txt b/N3/1.txt
index 3903b81..6c1537d 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -76,7 +76,7 @@ index 0a0b8e1..42cf68d 100644
*/
- smu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL);
+ smu_cmdbuf_abs = memblock_phys_alloc_range(4096, 4096, 0, 0x80000000UL);
- if (smu_cmdbuf_abs = 0) {
+ if (smu_cmdbuf_abs == 0) {
printk(KERN_ERR "SMU: Command buffer allocation failed !\n");
ret = -EINVAL;
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
@@ -107,7 +107,7 @@ index e5ffdcd..531fa77 100644
- alloc = memblock_alloc_range_nid(size, align, 0, max_addr, NUMA_NO_NODE,
- MEMBLOCK_NONE);
-
-- if (alloc = 0)
+- if (alloc == 0)
- panic("ERROR: Failed to allocate %pa bytes below %pa.\n",
- &size, &max_addr);
-
diff --git a/a/content_digest b/N3/content_digest
index 6450efa..f62032c 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -8,60 +8,33 @@
"Subject\0[PATCH v2 09/21] memblock: drop memblock_alloc_base()\0"
]
[
- "Date\0Mon, 21 Jan 2019 08:03:56 +0000\0"
+ "Date\0Mon, 21 Jan 2019 10:03:56 +0200\0"
]
[
"To\0linux-mm\@kvack.org\0"
]
[
- "Cc\0Rich Felker <dalias\@libc.org>",
- " linux-ia64\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
+ "Cc\0Andrew Morton <akpm\@linux-foundation.org>",
" Catalin Marinas <catalin.marinas\@arm.com>",
- " Heiko Carstens <heiko.carstens\@de.ibm.com>",
- " x86\@kernel.org",
- " linux-mips\@vger.kernel.org",
- " Max Filippov <jcmvbkbc\@gmail.com>",
- " Guo Ren <guoren\@kernel.org>",
- " sparclinux\@vger.kernel.org",
" Christoph Hellwig <hch\@lst.de>",
- " linux-s390\@vger.kernel.org",
- " linux-c6x-dev\@linux-c6x.org",
- " Yoshinori Sato <ysato\@users.sourceforge.jp>",
- " Richard Weinberger <richard\@nod.at>",
- " linux-sh\@vger.kernel.org",
- " Russell King <linux\@armlinux.org.uk>",
- " kasan-dev\@googlegroups.com",
- " Mike Rapoport <rppt\@linux.ibm.com>",
- " Geert Uytterhoeven <geert\@linux-m68k.org>",
- " Mark Salter <msalter\@redhat.com>",
+ " David S. Miller <davem\@davemloft.net>",
" Dennis Zhou <dennis\@kernel.org>",
- " Matt Turner <mattst88\@gmail.com>",
- " linux-snps-arc\@lists.infradead.org",
- " uclinux-h8-devel\@lists.sourceforge.jp",
- " Petr Mladek <pmladek\@suse.com>",
- " linux-xtensa\@linux-xtensa.org",
- " linux-alpha\@vger.kernel.org",
- " linux-um\@lists.infradead.org",
- " linux-m68k\@lists.linux-m68k.org",
- " Rob Herring <robh+dt\@kernel.org>",
+ " Geert Uytterhoeven <geert\@linux-m68k.org>",
" Greentime Hu <green.hu\@gmail.com>",
- " xen-devel\@lists.xenproject.org",
- " Stafford Horne <shorne\@gmail.com>",
+ " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
" Guan Xuetao <gxt\@pku.edu.cn>",
- " linux-arm-kernel\@lists.infradead.org",
+ " Guo Ren <guoren\@kernel.org>",
+ " Heiko Carstens <heiko.carstens\@de.ibm.com>",
+ " Mark Salter <msalter\@redhat.com>",
+ " Matt Turner <mattst88\@gmail.com>",
+ " Max Filippov <jcmvbkbc\@gmail.com>",
+ " Michael Ellerman <mpe\@ellerman.id.au>",
" Michal Simek <monstr\@monstr.eu>",
- " Tony Luck <tony.luck\@intel.com>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " linux-usb\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
" Paul Burton <paul.burton\@mips.com>",
- " Vineet Gupta <vgupta\@synopsys.com>",
- " Michael Ellerman <mpe\@ellerman.id.au>",
- " Andrew Morton <akpm\@linux-foundation.org>",
- " linuxppc-dev\@lists.ozlabs.org",
- " David S. Miller <davem\@davemloft.net>",
- " openrisc\@lists.librecores.org\0"
+ " Petr Mladek <pmladek\@suse.com>",
+ " Rich Felker <dalias\@libc.org>",
+ " Richard Weinberger <richard\@nod.at>",
+ " Rob Herring <robh+d>\0"
]
[
"\0000:1\0"
@@ -148,7 +121,7 @@
" \t */\n",
"-\tsmu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL);\n",
"+\tsmu_cmdbuf_abs = memblock_phys_alloc_range(4096, 4096, 0, 0x80000000UL);\n",
- " \tif (smu_cmdbuf_abs = 0) {\n",
+ " \tif (smu_cmdbuf_abs == 0) {\n",
" \t\tprintk(KERN_ERR \"SMU: Command buffer allocation failed !\\n\");\n",
" \t\tret = -EINVAL;\n",
"diff --git a/include/linux/memblock.h b/include/linux/memblock.h\n",
@@ -179,7 +152,7 @@
"-\talloc = memblock_alloc_range_nid(size, align, 0, max_addr, NUMA_NO_NODE,\n",
"-\t\t\t\t\tMEMBLOCK_NONE);\n",
"-\n",
- "-\tif (alloc = 0)\n",
+ "-\tif (alloc == 0)\n",
"-\t\tpanic(\"ERROR: Failed to allocate %pa bytes below %pa.\\n\",\n",
"-\t\t &size, &max_addr);\n",
"-\n",
@@ -193,4 +166,4 @@
"2.7.4"
]
-48053bf7aa24cf04b9e2e88d4e100140c941c7dbebaf4ac2a1db258ad3613fcf
+3bcb82bbf79b82ea6b70cb1acdfde25829f47d1bcdba41ce174b6a9b5a19581a
diff --git a/a/1.txt b/N4/1.txt
index 3903b81..4bf9465 100644
--- a/a/1.txt
+++ b/N4/1.txt
@@ -76,7 +76,7 @@ index 0a0b8e1..42cf68d 100644
*/
- smu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL);
+ smu_cmdbuf_abs = memblock_phys_alloc_range(4096, 4096, 0, 0x80000000UL);
- if (smu_cmdbuf_abs = 0) {
+ if (smu_cmdbuf_abs == 0) {
printk(KERN_ERR "SMU: Command buffer allocation failed !\n");
ret = -EINVAL;
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
@@ -107,7 +107,7 @@ index e5ffdcd..531fa77 100644
- alloc = memblock_alloc_range_nid(size, align, 0, max_addr, NUMA_NO_NODE,
- MEMBLOCK_NONE);
-
-- if (alloc = 0)
+- if (alloc == 0)
- panic("ERROR: Failed to allocate %pa bytes below %pa.\n",
- &size, &max_addr);
-
@@ -116,6 +116,4 @@ index e5ffdcd..531fa77 100644
-
phys_addr_t __init memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid)
{
- phys_addr_t res = memblock_phys_alloc_nid(size, align, nid);
---
-2.7.4
\ No newline at end of file
+ phys_addr_t res = memblock_phys_alloc_nid(size, align, nid);
\ No newline at end of file
diff --git a/a/content_digest b/N4/content_digest
index 6450efa..784a336 100644
--- a/a/content_digest
+++ b/N4/content_digest
@@ -1,67 +1,64 @@
-[
- "ref\0001548057848-15136-1-git-send-email-rppt\@linux.ibm.com\0"
-]
[
"From\0Mike Rapoport <rppt\@linux.ibm.com>\0"
]
[
- "Subject\0[PATCH v2 09/21] memblock: drop memblock_alloc_base()\0"
+ "Subject\0[v2,09/21] memblock: drop memblock_alloc_base()\0"
]
[
- "Date\0Mon, 21 Jan 2019 08:03:56 +0000\0"
+ "Date\0Mon, 21 Jan 2019 10:03:56 +0200\0"
]
[
"To\0linux-mm\@kvack.org\0"
]
[
- "Cc\0Rich Felker <dalias\@libc.org>",
- " linux-ia64\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
+ "Cc\0Andrew Morton <akpm\@linux-foundation.org>",
" Catalin Marinas <catalin.marinas\@arm.com>",
- " Heiko Carstens <heiko.carstens\@de.ibm.com>",
- " x86\@kernel.org",
- " linux-mips\@vger.kernel.org",
- " Max Filippov <jcmvbkbc\@gmail.com>",
- " Guo Ren <guoren\@kernel.org>",
- " sparclinux\@vger.kernel.org",
" Christoph Hellwig <hch\@lst.de>",
- " linux-s390\@vger.kernel.org",
- " linux-c6x-dev\@linux-c6x.org",
- " Yoshinori Sato <ysato\@users.sourceforge.jp>",
- " Richard Weinberger <richard\@nod.at>",
- " linux-sh\@vger.kernel.org",
- " Russell King <linux\@armlinux.org.uk>",
- " kasan-dev\@googlegroups.com",
- " Mike Rapoport <rppt\@linux.ibm.com>",
+ " David S. Miller <davem\@davemloft.net>",
+ " Dennis Zhou <dennis\@kernel.org>",
" Geert Uytterhoeven <geert\@linux-m68k.org>",
+ " Greentime Hu <green.hu\@gmail.com>",
+ " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
+ " Guan Xuetao <gxt\@pku.edu.cn>",
+ " Guo Ren <guoren\@kernel.org>",
+ " Heiko Carstens <heiko.carstens\@de.ibm.com>",
" Mark Salter <msalter\@redhat.com>",
- " Dennis Zhou <dennis\@kernel.org>",
" Matt Turner <mattst88\@gmail.com>",
- " linux-snps-arc\@lists.infradead.org",
- " uclinux-h8-devel\@lists.sourceforge.jp",
+ " Max Filippov <jcmvbkbc\@gmail.com>",
+ " Michael Ellerman <mpe\@ellerman.id.au>",
+ " Michal Simek <monstr\@monstr.eu>",
+ " Paul Burton <paul.burton\@mips.com>",
" Petr Mladek <pmladek\@suse.com>",
- " linux-xtensa\@linux-xtensa.org",
- " linux-alpha\@vger.kernel.org",
- " linux-um\@lists.infradead.org",
- " linux-m68k\@lists.linux-m68k.org",
+ " Rich Felker <dalias\@libc.org>",
+ " Richard Weinberger <richard\@nod.at>",
" Rob Herring <robh+dt\@kernel.org>",
- " Greentime Hu <green.hu\@gmail.com>",
- " xen-devel\@lists.xenproject.org",
+ " Russell King <linux\@armlinux.org.uk>",
" Stafford Horne <shorne\@gmail.com>",
- " Guan Xuetao <gxt\@pku.edu.cn>",
- " linux-arm-kernel\@lists.infradead.org",
- " Michal Simek <monstr\@monstr.eu>",
" Tony Luck <tony.luck\@intel.com>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " linux-usb\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " Paul Burton <paul.burton\@mips.com>",
" Vineet Gupta <vgupta\@synopsys.com>",
- " Michael Ellerman <mpe\@ellerman.id.au>",
- " Andrew Morton <akpm\@linux-foundation.org>",
+ " Yoshinori Sato <ysato\@users.sourceforge.jp>",
+ " devicetree\@vger.kernel.org",
+ " kasan-dev\@googlegroups.com",
+ " linux-alpha\@vger.kernel.org",
+ " linux-arm-kernel\@lists.infradead.org",
+ " linux-c6x-dev\@linux-c6x.org",
+ " linux-ia64\@vger.kernel.org",
+ " linux-kernel\@vger.kernel.org",
+ " linux-m68k\@lists.linux-m68k.org",
+ " linux-mips\@vger.kernel.org",
+ " linux-s390\@vger.kernel.org",
+ " linux-sh\@vger.kernel.org",
+ " linux-snps-arc\@lists.infradead.org",
+ " linux-um\@lists.infradead.org",
+ " linux-usb\@vger.kernel.org",
+ " linux-xtensa\@linux-xtensa.org",
" linuxppc-dev\@lists.ozlabs.org",
- " David S. Miller <davem\@davemloft.net>",
- " openrisc\@lists.librecores.org\0"
+ " openrisc\@lists.librecores.org",
+ " sparclinux\@vger.kernel.org",
+ " uclinux-h8-devel\@lists.sourceforge.jp",
+ " x86\@kernel.org",
+ " xen-devel\@lists.xenproject.org",
+ " Mike Rapoport <rppt\@linux.ibm.com>\0"
]
[
"\0000:1\0"
@@ -148,7 +145,7 @@
" \t */\n",
"-\tsmu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL);\n",
"+\tsmu_cmdbuf_abs = memblock_phys_alloc_range(4096, 4096, 0, 0x80000000UL);\n",
- " \tif (smu_cmdbuf_abs = 0) {\n",
+ " \tif (smu_cmdbuf_abs == 0) {\n",
" \t\tprintk(KERN_ERR \"SMU: Command buffer allocation failed !\\n\");\n",
" \t\tret = -EINVAL;\n",
"diff --git a/include/linux/memblock.h b/include/linux/memblock.h\n",
@@ -179,7 +176,7 @@
"-\talloc = memblock_alloc_range_nid(size, align, 0, max_addr, NUMA_NO_NODE,\n",
"-\t\t\t\t\tMEMBLOCK_NONE);\n",
"-\n",
- "-\tif (alloc = 0)\n",
+ "-\tif (alloc == 0)\n",
"-\t\tpanic(\"ERROR: Failed to allocate %pa bytes below %pa.\\n\",\n",
"-\t\t &size, &max_addr);\n",
"-\n",
@@ -188,9 +185,7 @@
"-\n",
" phys_addr_t __init memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid)\n",
" {\n",
- " \tphys_addr_t res = memblock_phys_alloc_nid(size, align, nid);\n",
- "-- \n",
- "2.7.4"
+ " \tphys_addr_t res = memblock_phys_alloc_nid(size, align, nid);"
]
-48053bf7aa24cf04b9e2e88d4e100140c941c7dbebaf4ac2a1db258ad3613fcf
+16d1c06fc563b278f37a03300700ce034c698a13a9a36f23b45d0af4ed41a7b4
diff --git a/a/1.txt b/N5/1.txt
index 3903b81..6c1537d 100644
--- a/a/1.txt
+++ b/N5/1.txt
@@ -76,7 +76,7 @@ index 0a0b8e1..42cf68d 100644
*/
- smu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL);
+ smu_cmdbuf_abs = memblock_phys_alloc_range(4096, 4096, 0, 0x80000000UL);
- if (smu_cmdbuf_abs = 0) {
+ if (smu_cmdbuf_abs == 0) {
printk(KERN_ERR "SMU: Command buffer allocation failed !\n");
ret = -EINVAL;
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
@@ -107,7 +107,7 @@ index e5ffdcd..531fa77 100644
- alloc = memblock_alloc_range_nid(size, align, 0, max_addr, NUMA_NO_NODE,
- MEMBLOCK_NONE);
-
-- if (alloc = 0)
+- if (alloc == 0)
- panic("ERROR: Failed to allocate %pa bytes below %pa.\n",
- &size, &max_addr);
-
diff --git a/a/content_digest b/N5/content_digest
index 6450efa..19d0071 100644
--- a/a/content_digest
+++ b/N5/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v2 09/21] memblock: drop memblock_alloc_base()\0"
]
[
- "Date\0Mon, 21 Jan 2019 08:03:56 +0000\0"
+ "Date\0Mon, 21 Jan 2019 10:03:56 +0200\0"
]
[
"To\0linux-mm\@kvack.org\0"
@@ -57,7 +57,6 @@
" linux-kernel\@vger.kernel.org",
" Paul Burton <paul.burton\@mips.com>",
" Vineet Gupta <vgupta\@synopsys.com>",
- " Michael Ellerman <mpe\@ellerman.id.au>",
" Andrew Morton <akpm\@linux-foundation.org>",
" linuxppc-dev\@lists.ozlabs.org",
" David S. Miller <davem\@davemloft.net>",
@@ -148,7 +147,7 @@
" \t */\n",
"-\tsmu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL);\n",
"+\tsmu_cmdbuf_abs = memblock_phys_alloc_range(4096, 4096, 0, 0x80000000UL);\n",
- " \tif (smu_cmdbuf_abs = 0) {\n",
+ " \tif (smu_cmdbuf_abs == 0) {\n",
" \t\tprintk(KERN_ERR \"SMU: Command buffer allocation failed !\\n\");\n",
" \t\tret = -EINVAL;\n",
"diff --git a/include/linux/memblock.h b/include/linux/memblock.h\n",
@@ -179,7 +178,7 @@
"-\talloc = memblock_alloc_range_nid(size, align, 0, max_addr, NUMA_NO_NODE,\n",
"-\t\t\t\t\tMEMBLOCK_NONE);\n",
"-\n",
- "-\tif (alloc = 0)\n",
+ "-\tif (alloc == 0)\n",
"-\t\tpanic(\"ERROR: Failed to allocate %pa bytes below %pa.\\n\",\n",
"-\t\t &size, &max_addr);\n",
"-\n",
@@ -193,4 +192,4 @@
"2.7.4"
]
-48053bf7aa24cf04b9e2e88d4e100140c941c7dbebaf4ac2a1db258ad3613fcf
+23e2de99f623738e1c1662a077f17374cbb865fcd015a3c9e13e25fa931bcef0
diff --git a/a/1.txt b/N6/1.txt
index 3903b81..05892ff 100644
--- a/a/1.txt
+++ b/N6/1.txt
@@ -3,7 +3,7 @@ limit specified by its max_addr parameter and panics if the allocation
fails. Replace its usage with memblock_phys_alloc_range() and make the
callers check the return value and panic in case of error.
-Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
+Signed-off-by: Mike Rapoport <rppt at linux.ibm.com>
---
arch/powerpc/kernel/rtas.c | 6 +++++-
arch/powerpc/mm/hash_utils_64.c | 8 ++++++--
@@ -76,7 +76,7 @@ index 0a0b8e1..42cf68d 100644
*/
- smu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL);
+ smu_cmdbuf_abs = memblock_phys_alloc_range(4096, 4096, 0, 0x80000000UL);
- if (smu_cmdbuf_abs = 0) {
+ if (smu_cmdbuf_abs == 0) {
printk(KERN_ERR "SMU: Command buffer allocation failed !\n");
ret = -EINVAL;
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
@@ -107,7 +107,7 @@ index e5ffdcd..531fa77 100644
- alloc = memblock_alloc_range_nid(size, align, 0, max_addr, NUMA_NO_NODE,
- MEMBLOCK_NONE);
-
-- if (alloc = 0)
+- if (alloc == 0)
- panic("ERROR: Failed to allocate %pa bytes below %pa.\n",
- &size, &max_addr);
-
diff --git a/a/content_digest b/N6/content_digest
index 6450efa..246463b 100644
--- a/a/content_digest
+++ b/N6/content_digest
@@ -2,66 +2,16 @@
"ref\0001548057848-15136-1-git-send-email-rppt\@linux.ibm.com\0"
]
[
- "From\0Mike Rapoport <rppt\@linux.ibm.com>\0"
+ "From\0rppt\@linux.ibm.com (Mike Rapoport)\0"
]
[
"Subject\0[PATCH v2 09/21] memblock: drop memblock_alloc_base()\0"
]
[
- "Date\0Mon, 21 Jan 2019 08:03:56 +0000\0"
+ "Date\0Mon, 21 Jan 2019 10:03:56 +0200\0"
]
[
- "To\0linux-mm\@kvack.org\0"
-]
-[
- "Cc\0Rich Felker <dalias\@libc.org>",
- " linux-ia64\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
- " Catalin Marinas <catalin.marinas\@arm.com>",
- " Heiko Carstens <heiko.carstens\@de.ibm.com>",
- " x86\@kernel.org",
- " linux-mips\@vger.kernel.org",
- " Max Filippov <jcmvbkbc\@gmail.com>",
- " Guo Ren <guoren\@kernel.org>",
- " sparclinux\@vger.kernel.org",
- " Christoph Hellwig <hch\@lst.de>",
- " linux-s390\@vger.kernel.org",
- " linux-c6x-dev\@linux-c6x.org",
- " Yoshinori Sato <ysato\@users.sourceforge.jp>",
- " Richard Weinberger <richard\@nod.at>",
- " linux-sh\@vger.kernel.org",
- " Russell King <linux\@armlinux.org.uk>",
- " kasan-dev\@googlegroups.com",
- " Mike Rapoport <rppt\@linux.ibm.com>",
- " Geert Uytterhoeven <geert\@linux-m68k.org>",
- " Mark Salter <msalter\@redhat.com>",
- " Dennis Zhou <dennis\@kernel.org>",
- " Matt Turner <mattst88\@gmail.com>",
- " linux-snps-arc\@lists.infradead.org",
- " uclinux-h8-devel\@lists.sourceforge.jp",
- " Petr Mladek <pmladek\@suse.com>",
- " linux-xtensa\@linux-xtensa.org",
- " linux-alpha\@vger.kernel.org",
- " linux-um\@lists.infradead.org",
- " linux-m68k\@lists.linux-m68k.org",
- " Rob Herring <robh+dt\@kernel.org>",
- " Greentime Hu <green.hu\@gmail.com>",
- " xen-devel\@lists.xenproject.org",
- " Stafford Horne <shorne\@gmail.com>",
- " Guan Xuetao <gxt\@pku.edu.cn>",
- " linux-arm-kernel\@lists.infradead.org",
- " Michal Simek <monstr\@monstr.eu>",
- " Tony Luck <tony.luck\@intel.com>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " linux-usb\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " Paul Burton <paul.burton\@mips.com>",
- " Vineet Gupta <vgupta\@synopsys.com>",
- " Michael Ellerman <mpe\@ellerman.id.au>",
- " Andrew Morton <akpm\@linux-foundation.org>",
- " linuxppc-dev\@lists.ozlabs.org",
- " David S. Miller <davem\@davemloft.net>",
- " openrisc\@lists.librecores.org\0"
+ "To\0linux-snps-arc\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -75,7 +25,7 @@
"fails. Replace its usage with memblock_phys_alloc_range() and make the\n",
"callers check the return value and panic in case of error.\n",
"\n",
- "Signed-off-by: Mike Rapoport <rppt\@linux.ibm.com>\n",
+ "Signed-off-by: Mike Rapoport <rppt at linux.ibm.com>\n",
"---\n",
" arch/powerpc/kernel/rtas.c | 6 +++++-\n",
" arch/powerpc/mm/hash_utils_64.c | 8 ++++++--\n",
@@ -148,7 +98,7 @@
" \t */\n",
"-\tsmu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL);\n",
"+\tsmu_cmdbuf_abs = memblock_phys_alloc_range(4096, 4096, 0, 0x80000000UL);\n",
- " \tif (smu_cmdbuf_abs = 0) {\n",
+ " \tif (smu_cmdbuf_abs == 0) {\n",
" \t\tprintk(KERN_ERR \"SMU: Command buffer allocation failed !\\n\");\n",
" \t\tret = -EINVAL;\n",
"diff --git a/include/linux/memblock.h b/include/linux/memblock.h\n",
@@ -179,7 +129,7 @@
"-\talloc = memblock_alloc_range_nid(size, align, 0, max_addr, NUMA_NO_NODE,\n",
"-\t\t\t\t\tMEMBLOCK_NONE);\n",
"-\n",
- "-\tif (alloc = 0)\n",
+ "-\tif (alloc == 0)\n",
"-\t\tpanic(\"ERROR: Failed to allocate %pa bytes below %pa.\\n\",\n",
"-\t\t &size, &max_addr);\n",
"-\n",
@@ -193,4 +143,4 @@
"2.7.4"
]
-48053bf7aa24cf04b9e2e88d4e100140c941c7dbebaf4ac2a1db258ad3613fcf
+0318cc8e71b37fc5ef0827ceae392dad59dcb98de3d08fc9a81ef6e04415f241
diff --git a/a/1.txt b/N7/1.txt
index 3903b81..14ded19 100644
--- a/a/1.txt
+++ b/N7/1.txt
@@ -72,11 +72,11 @@ index 0a0b8e1..42cf68d 100644
+++ b/drivers/macintosh/smu.c
@@ -485,7 +485,7 @@ int __init smu_init (void)
* SMU based G5s need some memory below 2Gb. Thankfully this is
- * called at a time where memblock is still available.
+ * called@a time where memblock is still available.
*/
- smu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL);
+ smu_cmdbuf_abs = memblock_phys_alloc_range(4096, 4096, 0, 0x80000000UL);
- if (smu_cmdbuf_abs = 0) {
+ if (smu_cmdbuf_abs == 0) {
printk(KERN_ERR "SMU: Command buffer allocation failed !\n");
ret = -EINVAL;
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
@@ -107,7 +107,7 @@ index e5ffdcd..531fa77 100644
- alloc = memblock_alloc_range_nid(size, align, 0, max_addr, NUMA_NO_NODE,
- MEMBLOCK_NONE);
-
-- if (alloc = 0)
+- if (alloc == 0)
- panic("ERROR: Failed to allocate %pa bytes below %pa.\n",
- &size, &max_addr);
-
diff --git a/a/content_digest b/N7/content_digest
index 6450efa..b4aaa17 100644
--- a/a/content_digest
+++ b/N7/content_digest
@@ -5,63 +5,13 @@
"From\0Mike Rapoport <rppt\@linux.ibm.com>\0"
]
[
- "Subject\0[PATCH v2 09/21] memblock: drop memblock_alloc_base()\0"
+ "Subject\0[OpenRISC] [PATCH v2 09/21] memblock: drop memblock_alloc_base()\0"
]
[
- "Date\0Mon, 21 Jan 2019 08:03:56 +0000\0"
+ "Date\0Mon, 21 Jan 2019 10:03:56 +0200\0"
]
[
- "To\0linux-mm\@kvack.org\0"
-]
-[
- "Cc\0Rich Felker <dalias\@libc.org>",
- " linux-ia64\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
- " Catalin Marinas <catalin.marinas\@arm.com>",
- " Heiko Carstens <heiko.carstens\@de.ibm.com>",
- " x86\@kernel.org",
- " linux-mips\@vger.kernel.org",
- " Max Filippov <jcmvbkbc\@gmail.com>",
- " Guo Ren <guoren\@kernel.org>",
- " sparclinux\@vger.kernel.org",
- " Christoph Hellwig <hch\@lst.de>",
- " linux-s390\@vger.kernel.org",
- " linux-c6x-dev\@linux-c6x.org",
- " Yoshinori Sato <ysato\@users.sourceforge.jp>",
- " Richard Weinberger <richard\@nod.at>",
- " linux-sh\@vger.kernel.org",
- " Russell King <linux\@armlinux.org.uk>",
- " kasan-dev\@googlegroups.com",
- " Mike Rapoport <rppt\@linux.ibm.com>",
- " Geert Uytterhoeven <geert\@linux-m68k.org>",
- " Mark Salter <msalter\@redhat.com>",
- " Dennis Zhou <dennis\@kernel.org>",
- " Matt Turner <mattst88\@gmail.com>",
- " linux-snps-arc\@lists.infradead.org",
- " uclinux-h8-devel\@lists.sourceforge.jp",
- " Petr Mladek <pmladek\@suse.com>",
- " linux-xtensa\@linux-xtensa.org",
- " linux-alpha\@vger.kernel.org",
- " linux-um\@lists.infradead.org",
- " linux-m68k\@lists.linux-m68k.org",
- " Rob Herring <robh+dt\@kernel.org>",
- " Greentime Hu <green.hu\@gmail.com>",
- " xen-devel\@lists.xenproject.org",
- " Stafford Horne <shorne\@gmail.com>",
- " Guan Xuetao <gxt\@pku.edu.cn>",
- " linux-arm-kernel\@lists.infradead.org",
- " Michal Simek <monstr\@monstr.eu>",
- " Tony Luck <tony.luck\@intel.com>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " linux-usb\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " Paul Burton <paul.burton\@mips.com>",
- " Vineet Gupta <vgupta\@synopsys.com>",
- " Michael Ellerman <mpe\@ellerman.id.au>",
- " Andrew Morton <akpm\@linux-foundation.org>",
- " linuxppc-dev\@lists.ozlabs.org",
- " David S. Miller <davem\@davemloft.net>",
- " openrisc\@lists.librecores.org\0"
+ "To\0openrisc\@lists.librecores.org\0"
]
[
"\0000:1\0"
@@ -144,11 +94,11 @@
"+++ b/drivers/macintosh/smu.c\n",
"\@\@ -485,7 +485,7 \@\@ int __init smu_init (void)\n",
" \t * SMU based G5s need some memory below 2Gb. Thankfully this is\n",
- " \t * called at a time where memblock is still available.\n",
+ " \t * called\@a time where memblock is still available.\n",
" \t */\n",
"-\tsmu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL);\n",
"+\tsmu_cmdbuf_abs = memblock_phys_alloc_range(4096, 4096, 0, 0x80000000UL);\n",
- " \tif (smu_cmdbuf_abs = 0) {\n",
+ " \tif (smu_cmdbuf_abs == 0) {\n",
" \t\tprintk(KERN_ERR \"SMU: Command buffer allocation failed !\\n\");\n",
" \t\tret = -EINVAL;\n",
"diff --git a/include/linux/memblock.h b/include/linux/memblock.h\n",
@@ -179,7 +129,7 @@
"-\talloc = memblock_alloc_range_nid(size, align, 0, max_addr, NUMA_NO_NODE,\n",
"-\t\t\t\t\tMEMBLOCK_NONE);\n",
"-\n",
- "-\tif (alloc = 0)\n",
+ "-\tif (alloc == 0)\n",
"-\t\tpanic(\"ERROR: Failed to allocate %pa bytes below %pa.\\n\",\n",
"-\t\t &size, &max_addr);\n",
"-\n",
@@ -193,4 +143,4 @@
"2.7.4"
]
-48053bf7aa24cf04b9e2e88d4e100140c941c7dbebaf4ac2a1db258ad3613fcf
+8fa5f6d56a75e42dc9b9458d25e3ccb6a3dbaad5a9fbfa4fa723a71da3e6c751
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.