diff for duplicates of <20191023195859.GA24394@rapoport-lnx> diff --git a/a/content_digest b/N1/content_digest index 73e0358..1512cba 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -23,7 +23,17 @@ Russell King <linux@armlinux.org.uk> Sam Creasey <sammy@sammy.net> Vincent Chen <deanbo422@gmail.com> - " Vineet\0" + Vineet Gupta <Vineet.Gupta1@synopsys.com> + linux-alpha@vger.kernel.org + linux-arch@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-c6x-dev@linux-c6x.org + linux-kernel@vger.kernel.org + linux-m68k@lists.linux-m68k.org + linux-parisc@vger.kernel.org + linux-um@lists.infradead.org + sparclinux@vger.kernel.org + " Mike Rapoport <rppt@linux.ibm.com>\0" "\00:1\0" "b\0" "I've just discovered that I've booted qemu-sparc with the wrong kernel and\n" @@ -416,4 +426,4 @@ "-- \n" 2.7.4 -4558311e1348d6afd3ebf8227b7a85259ef05d6291ad91622a8931a52d1e3ee8 +344718b9a6b5f01a1e741cfb002bd229877c6cd8f135f7feaafc63c85d3d980e
diff --git a/a/1.txt b/N2/1.txt index c077f65..c3fecb5 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -100,8 +100,8 @@ index 31da448..6d6f44c 100644 -static inline int pgd_present(pgd_t pgd) +static inline int pud_present(pud_t pud) { -- return ((pgd_val(pgd) & SRMMU_ET_MASK) == SRMMU_ET_PTD); -+ return ((pud_val(pud) & SRMMU_ET_MASK) == SRMMU_ET_PTD); +- return ((pgd_val(pgd) & SRMMU_ET_MASK) = SRMMU_ET_PTD); ++ return ((pud_val(pud) & SRMMU_ET_MASK) = SRMMU_ET_PTD); } -static inline void pgd_clear(pgd_t *pgdp) @@ -295,7 +295,7 @@ index cc3ad64..f56c3c9 100644 + if (pud_none(*(pud_t *)__nocache_fix(pudp))) { pmdp = __srmmu_get_nocache( SRMMU_PMD_TABLE_SIZE, SRMMU_PMD_TABLE_SIZE); - if (pmdp == NULL) + if (pmdp = NULL) early_pgtable_allocfail("pmd"); memset(__nocache_fix(pmdp), 0, SRMMU_PMD_TABLE_SIZE); - pgd_set(__nocache_fix(pgdp), pmdp); @@ -305,7 +305,7 @@ index cc3ad64..f56c3c9 100644 + pmdp = pmd_offset(__nocache_fix(pudp), start); if (srmmu_pmd_none(*(pmd_t *)__nocache_fix(pmdp))) { ptep = __srmmu_get_nocache(PTE_SIZE, PTE_SIZE); - if (ptep == NULL) + if (ptep = NULL) @@ -724,19 +741,23 @@ static void __init srmmu_allocate_ptable_skeleton(unsigned long start, unsigned long end) { @@ -322,7 +322,7 @@ index cc3ad64..f56c3c9 100644 + pudp = pud_offset(p4dp, start); + if (pud_none(*pudp)) { pmdp = __srmmu_get_nocache(SRMMU_PMD_TABLE_SIZE, SRMMU_PMD_TABLE_SIZE); - if (pmdp == NULL) + if (pmdp = NULL) early_pgtable_allocfail("pmd"); memset(pmdp, 0, SRMMU_PMD_TABLE_SIZE); - pgd_set(pgdp, pmdp); @@ -348,7 +348,7 @@ index cc3ad64..f56c3c9 100644 pgdp = pgd_offset_k(start); + p4dp = p4d_offset(pgdp, start); + pudp = pud_offset(p4dp, start); - if (what == 2) { + if (what = 2) { *(pgd_t *)__nocache_fix(pgdp) = __pgd(probed); start += SRMMU_PGDIR_SIZE; continue; @@ -357,7 +357,7 @@ index cc3ad64..f56c3c9 100644 + if (pud_none(*(pud_t *)__nocache_fix(pudp))) { pmdp = __srmmu_get_nocache(SRMMU_PMD_TABLE_SIZE, SRMMU_PMD_TABLE_SIZE); - if (pmdp == NULL) + if (pmdp = NULL) early_pgtable_allocfail("pmd"); memset(__nocache_fix(pmdp), 0, SRMMU_PMD_TABLE_SIZE); - pgd_set(__nocache_fix(pgdp), pmdp); diff --git a/a/content_digest b/N2/content_digest index 73e0358..65e1fe7 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\01571822941-29776-10-git-send-email-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v2 09/12] sparc32: use pgtable-nopud instead of 4level-fixup\0" - "Date\0Wed, 23 Oct 2019 22:59:00 +0300\0" + "Date\0Wed, 23 Oct 2019 19:59:00 +0000\0" "To\0linux-mm@kvack.org\0" "Cc\0Andrew Morton <akpm@linux-foundation.org>" Anton Ivanov <anton.ivanov@cambridgegreys.com> @@ -128,8 +128,8 @@ "-static inline int pgd_present(pgd_t pgd)\n" "+static inline int pud_present(pud_t pud)\n" " {\n" - "-\treturn ((pgd_val(pgd) & SRMMU_ET_MASK) == SRMMU_ET_PTD);\n" - "+\treturn ((pud_val(pud) & SRMMU_ET_MASK) == SRMMU_ET_PTD);\n" + "-\treturn ((pgd_val(pgd) & SRMMU_ET_MASK) = SRMMU_ET_PTD);\n" + "+\treturn ((pud_val(pud) & SRMMU_ET_MASK) = SRMMU_ET_PTD);\n" " }\n" " \n" "-static inline void pgd_clear(pgd_t *pgdp)\n" @@ -323,7 +323,7 @@ "+\t\tif (pud_none(*(pud_t *)__nocache_fix(pudp))) {\n" " \t\t\tpmdp = __srmmu_get_nocache(\n" " \t\t\t SRMMU_PMD_TABLE_SIZE, SRMMU_PMD_TABLE_SIZE);\n" - " \t\t\tif (pmdp == NULL)\n" + " \t\t\tif (pmdp = NULL)\n" " \t\t\t\tearly_pgtable_allocfail(\"pmd\");\n" " \t\t\tmemset(__nocache_fix(pmdp), 0, SRMMU_PMD_TABLE_SIZE);\n" "-\t\t\tpgd_set(__nocache_fix(pgdp), pmdp);\n" @@ -333,7 +333,7 @@ "+\t\tpmdp = pmd_offset(__nocache_fix(pudp), start);\n" " \t\tif (srmmu_pmd_none(*(pmd_t *)__nocache_fix(pmdp))) {\n" " \t\t\tptep = __srmmu_get_nocache(PTE_SIZE, PTE_SIZE);\n" - " \t\t\tif (ptep == NULL)\n" + " \t\t\tif (ptep = NULL)\n" "@@ -724,19 +741,23 @@ static void __init srmmu_allocate_ptable_skeleton(unsigned long start,\n" " \t\t\t\t\t\t unsigned long end)\n" " {\n" @@ -350,7 +350,7 @@ "+\t\tpudp = pud_offset(p4dp, start);\n" "+\t\tif (pud_none(*pudp)) {\n" " \t\t\tpmdp = __srmmu_get_nocache(SRMMU_PMD_TABLE_SIZE, SRMMU_PMD_TABLE_SIZE);\n" - " \t\t\tif (pmdp == NULL)\n" + " \t\t\tif (pmdp = NULL)\n" " \t\t\t\tearly_pgtable_allocfail(\"pmd\");\n" " \t\t\tmemset(pmdp, 0, SRMMU_PMD_TABLE_SIZE);\n" "-\t\t\tpgd_set(pgdp, pmdp);\n" @@ -376,7 +376,7 @@ " \t\tpgdp = pgd_offset_k(start);\n" "+\t\tp4dp = p4d_offset(pgdp, start);\n" "+\t\tpudp = pud_offset(p4dp, start);\n" - " \t\tif (what == 2) {\n" + " \t\tif (what = 2) {\n" " \t\t\t*(pgd_t *)__nocache_fix(pgdp) = __pgd(probed);\n" " \t\t\tstart += SRMMU_PGDIR_SIZE;\n" " \t\t\tcontinue;\n" @@ -385,7 +385,7 @@ "+\t\tif (pud_none(*(pud_t *)__nocache_fix(pudp))) {\n" " \t\t\tpmdp = __srmmu_get_nocache(SRMMU_PMD_TABLE_SIZE,\n" " \t\t\t\t\t\t SRMMU_PMD_TABLE_SIZE);\n" - " \t\t\tif (pmdp == NULL)\n" + " \t\t\tif (pmdp = NULL)\n" " \t\t\t\tearly_pgtable_allocfail(\"pmd\");\n" " \t\t\tmemset(__nocache_fix(pmdp), 0, SRMMU_PMD_TABLE_SIZE);\n" "-\t\t\tpgd_set(__nocache_fix(pgdp), pmdp);\n" @@ -416,4 +416,4 @@ "-- \n" 2.7.4 -4558311e1348d6afd3ebf8227b7a85259ef05d6291ad91622a8931a52d1e3ee8 +3727be30741ee29460552925d3d498710842be30ad56c6fd59f398eabf701250
diff --git a/a/1.txt b/N3/1.txt index c077f65..de4af43 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -387,3 +387,9 @@ index cc3ad64..f56c3c9 100644 -- 2.7.4 + + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N3/content_digest index 73e0358..4eda69b 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -4,26 +4,36 @@ "Subject\0[PATCH v2 09/12] sparc32: use pgtable-nopud instead of 4level-fixup\0" "Date\0Wed, 23 Oct 2019 22:59:00 +0300\0" "To\0linux-mm@kvack.org\0" - "Cc\0Andrew Morton <akpm@linux-foundation.org>" - Anton Ivanov <anton.ivanov@cambridgegreys.com> - Arnd Bergmann <arnd@arndb.de> - David S. Miller <davem@davemloft.net> - Geert Uytterhoeven <geert@linux-m68k.org> - Greentime Hu <green.hu@gmail.com> + "Cc\0James E.J. Bottomley <James.Bottomley@hansenpartnership.com>" + sparclinux@vger.kernel.org + Vincent Chen <deanbo422@gmail.com> Greg Ungerer <gerg@linux-m68k.org> + Anton Ivanov <anton.ivanov@cambridgegreys.com> + linux-arch@vger.kernel.org + linux-c6x-dev@linux-c6x.org + Richard Weinberger <richard@nod.at> Helge Deller <deller@gmx.de> - James E.J. Bottomley <James.Bottomley@hansenpartnership.com> - Jeff Dike <jdike@addtoit.com> - Kirill A. Shutemov <kirill@shutemov.name> - Linus Torvalds <torvalds@linux-foundation.org> + Russell King <linux@armlinux.org.uk> + Mike Rapoport <rppt@linux.ibm.com> + Geert Uytterhoeven <geert@linux-m68k.org> Mark Salter <msalter@redhat.com> Matt Turner <mattst88@gmail.com> - Michal Simek <monstr@monstr.eu> - Richard Weinberger <richard@nod.at> - Russell King <linux@armlinux.org.uk> + Jeff Dike <jdike@addtoit.com> Sam Creasey <sammy@sammy.net> - Vincent Chen <deanbo422@gmail.com> - " Vineet\0" + Arnd Bergmann <arnd@arndb.de> + Vineet Gupta <Vineet.Gupta1@synopsys.com> + linux-um@lists.infradead.org + linux-m68k@lists.linux-m68k.org + Greentime Hu <green.hu@gmail.com> + Kirill A. Shutemov <kirill@shutemov.name> + linux-arm-kernel@lists.infradead.org + Michal Simek <monstr@monstr.eu> + linux-parisc@vger.kernel.org + linux-kernel@vger.kernel.org + linux-alpha@vger.kernel.org + Andrew Morton <akpm@linux-foundation.org> + Linus Torvalds <torvalds@linux-foundation.org> + " David S. Miller <davem@davemloft.net>\0" "\00:1\0" "b\0" "I've just discovered that I've booted qemu-sparc with the wrong kernel and\n" @@ -414,6 +424,12 @@ " \tpkmap_page_table = pte;\n" " \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 -4558311e1348d6afd3ebf8227b7a85259ef05d6291ad91622a8931a52d1e3ee8 +262b55f82db67eb80614c7fdaae697e2937afac4c4f5e5a0895f46928b61532c
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.