diff for duplicates of <20200324104005.11279-3-will@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 1085d2e..f5789e4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -212,7 +212,7 @@ index 0bbefd184221..08ffc605035f 100644 @@ -227,7 +228,7 @@ static inline unsigned long viking_hwprobe(unsigned long vaddr) : "=r" (val) : "r" (vaddr | 0x200), "i" (ASI_M_FLUSH_PROBE)); - if ((val & SRMMU_ET_MASK) = SRMMU_ET_PTE) { + if ((val & SRMMU_ET_MASK) == SRMMU_ET_PTE) { - vaddr &= ~SRMMU_PGDIR_MASK; + vaddr &= ~PGDIR_MASK; vaddr >>= PAGE_SHIFT; @@ -221,7 +221,7 @@ index 0bbefd184221..08ffc605035f 100644 @@ -237,7 +238,7 @@ static inline unsigned long viking_hwprobe(unsigned long vaddr) : "=r" (val) : "r" (vaddr | 0x100), "i" (ASI_M_FLUSH_PROBE)); - if ((val & SRMMU_ET_MASK) = SRMMU_ET_PTE) { + if ((val & SRMMU_ET_MASK) == SRMMU_ET_PTE) { - vaddr &= ~SRMMU_REAL_PMD_MASK; + vaddr &= ~PMD_MASK; vaddr >>= PAGE_SHIFT; @@ -346,22 +346,22 @@ index a19863cac0c4..7fa096422bd0 100644 addr = start - PAGE_SIZE; - if (!(start & ~(SRMMU_REAL_PMD_MASK))) { -- if (srmmu_probe(addr + SRMMU_REAL_PMD_SIZE) = probed) +- if (srmmu_probe(addr + SRMMU_REAL_PMD_SIZE) == probed) + if (!(start & ~(PMD_MASK))) { -+ if (srmmu_probe(addr + PMD_SIZE) = probed) ++ if (srmmu_probe(addr + PMD_SIZE) == probed) what = 1; } - if (!(start & ~(SRMMU_PGDIR_MASK))) { -- if (srmmu_probe(addr + SRMMU_PGDIR_SIZE) = probed) +- if (srmmu_probe(addr + SRMMU_PGDIR_SIZE) == probed) + if (!(start & ~(PGDIR_MASK))) { -+ if (srmmu_probe(addr + PGDIR_SIZE) = probed) ++ if (srmmu_probe(addr + PGDIR_SIZE) == probed) what = 2; } @@ -837,7 +825,7 @@ static void __init srmmu_inherit_prom_mappings(unsigned long start, pudp = pud_offset(p4dp, start); - if (what = 2) { + if (what == 2) { *(pgd_t *)__nocache_fix(pgdp) = __pgd(probed); - start += SRMMU_PGDIR_SIZE; + start += PGDIR_SIZE; @@ -372,19 +372,19 @@ index a19863cac0c4..7fa096422bd0 100644 pud_set(__nocache_fix(pudp), pmdp); } pmdp = pmd_offset(__nocache_fix(pgdp), start); -+ if (what = 1) { ++ if (what == 1) { + *(pmd_t *)__nocache_fix(pmdp) = __pmd(probed); + start += PMD_SIZE; + continue; + } if (srmmu_pmd_none(*(pmd_t *)__nocache_fix(pmdp))) { ptep = __srmmu_get_nocache(PTE_SIZE, PTE_SIZE); - if (ptep = NULL) + if (ptep == NULL) @@ -856,19 +849,6 @@ static void __init srmmu_inherit_prom_mappings(unsigned long start, memset(__nocache_fix(ptep), 0, PTE_SIZE); pmd_set(__nocache_fix(pmdp), ptep); } -- if (what = 1) { +- if (what == 1) { - /* We bend the rule where all 16 PTPs in a pmd_t point - * inside the same PTE page, and we leak a perfectly - * good hardware PTE piece. Alternatives seem worse. diff --git a/a/content_digest b/N1/content_digest index 7e5e029..b06d1ca 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -226,7 +226,7 @@ "@@ -227,7 +228,7 @@ static inline unsigned long viking_hwprobe(unsigned long vaddr)\n" " \t\t\t : \"=r\" (val)\n" " \t\t\t : \"r\" (vaddr | 0x200), \"i\" (ASI_M_FLUSH_PROBE));\n" - " \tif ((val & SRMMU_ET_MASK) = SRMMU_ET_PTE) {\n" + " \tif ((val & SRMMU_ET_MASK) == SRMMU_ET_PTE) {\n" "-\t\tvaddr &= ~SRMMU_PGDIR_MASK;\n" "+\t\tvaddr &= ~PGDIR_MASK;\n" " \t\tvaddr >>= PAGE_SHIFT;\n" @@ -235,7 +235,7 @@ "@@ -237,7 +238,7 @@ static inline unsigned long viking_hwprobe(unsigned long vaddr)\n" " \t\t\t : \"=r\" (val)\n" " \t\t\t : \"r\" (vaddr | 0x100), \"i\" (ASI_M_FLUSH_PROBE));\n" - " \tif ((val & SRMMU_ET_MASK) = SRMMU_ET_PTE) {\n" + " \tif ((val & SRMMU_ET_MASK) == SRMMU_ET_PTE) {\n" "-\t\tvaddr &= ~SRMMU_REAL_PMD_MASK;\n" "+\t\tvaddr &= ~PMD_MASK;\n" " \t\tvaddr >>= PAGE_SHIFT;\n" @@ -360,22 +360,22 @@ " \t\taddr = start - PAGE_SIZE;\n" " \n" "-\t\tif (!(start & ~(SRMMU_REAL_PMD_MASK))) {\n" - "-\t\t\tif (srmmu_probe(addr + SRMMU_REAL_PMD_SIZE) = probed)\n" + "-\t\t\tif (srmmu_probe(addr + SRMMU_REAL_PMD_SIZE) == probed)\n" "+\t\tif (!(start & ~(PMD_MASK))) {\n" - "+\t\t\tif (srmmu_probe(addr + PMD_SIZE) = probed)\n" + "+\t\t\tif (srmmu_probe(addr + PMD_SIZE) == probed)\n" " \t\t\t\twhat = 1;\n" " \t\t}\n" " \n" "-\t\tif (!(start & ~(SRMMU_PGDIR_MASK))) {\n" - "-\t\t\tif (srmmu_probe(addr + SRMMU_PGDIR_SIZE) = probed)\n" + "-\t\t\tif (srmmu_probe(addr + SRMMU_PGDIR_SIZE) == probed)\n" "+\t\tif (!(start & ~(PGDIR_MASK))) {\n" - "+\t\t\tif (srmmu_probe(addr + PGDIR_SIZE) = probed)\n" + "+\t\t\tif (srmmu_probe(addr + PGDIR_SIZE) == probed)\n" " \t\t\t\twhat = 2;\n" " \t\t}\n" " \n" "@@ -837,7 +825,7 @@ static void __init srmmu_inherit_prom_mappings(unsigned long 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\tstart += PGDIR_SIZE;\n" @@ -386,19 +386,19 @@ " \t\t\tpud_set(__nocache_fix(pudp), pmdp);\n" " \t\t}\n" " \t\tpmdp = pmd_offset(__nocache_fix(pgdp), start);\n" - "+\t\tif (what = 1) {\n" + "+\t\tif (what == 1) {\n" "+\t\t\t*(pmd_t *)__nocache_fix(pmdp) = __pmd(probed);\n" "+\t\t\tstart += PMD_SIZE;\n" "+\t\t\tcontinue;\n" "+\t\t}\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" "@@ -856,19 +849,6 @@ static void __init srmmu_inherit_prom_mappings(unsigned long start,\n" " \t\t\tmemset(__nocache_fix(ptep), 0, PTE_SIZE);\n" " \t\t\tpmd_set(__nocache_fix(pmdp), ptep);\n" " \t\t}\n" - "-\t\tif (what = 1) {\n" + "-\t\tif (what == 1) {\n" "-\t\t\t/* We bend the rule where all 16 PTPs in a pmd_t point\n" "-\t\t\t * inside the same PTE page, and we leak a perfectly\n" "-\t\t\t * good hardware PTE piece. Alternatives seem worse.\n" @@ -469,4 +469,4 @@ "-- \n" 2.20.1 -866e0288539a310016cdf0ca0dfe276295400175520a453db71501abb2119cd1 +dd689e663d8e2b2b267b071e1982d6500315a0b0ae6a38c0e68cd4c21fb23a7d
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.