diff for duplicates of <20200524162151.3493-3-rppt@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 9265ea2..7dd5fef 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -44,12 +44,12 @@ index dbf5334dd084..d86e6c657922 100644 - if (srmmu_pmd_none(*(pmd_t *)__nocache_fix(pmdp))) { + if (srmmu_pmd_none(*__nocache_fix(pmdp))) { ptep = __srmmu_get_nocache(PTE_SIZE, PTE_SIZE); - if (ptep = NULL) + if (ptep == NULL) early_pgtable_allocfail("pte"); @@ -836,11 +836,11 @@ static void __init srmmu_inherit_prom_mappings(unsigned long start, p4dp = p4d_offset(pgdp, start); pudp = pud_offset(p4dp, start); - if (what = 2) { + if (what == 2) { - *(pgd_t *)__nocache_fix(pgdp) = __pgd(probed); + *__nocache_fix(pgdp) = __pgd(probed); start += SRMMU_PGDIR_SIZE; @@ -59,7 +59,7 @@ index dbf5334dd084..d86e6c657922 100644 + if (pud_none(*__nocache_fix(pudp))) { pmdp = __srmmu_get_nocache(SRMMU_PMD_TABLE_SIZE, SRMMU_PMD_TABLE_SIZE); - if (pmdp = NULL) + if (pmdp == NULL) @@ -849,7 +849,7 @@ static void __init srmmu_inherit_prom_mappings(unsigned long start, pud_set(__nocache_fix(pudp), pmdp); } @@ -67,7 +67,7 @@ index dbf5334dd084..d86e6c657922 100644 - if (srmmu_pmd_none(*(pmd_t *)__nocache_fix(pmdp))) { + if (srmmu_pmd_none(*__nocache_fix(pmdp))) { ptep = __srmmu_get_nocache(PTE_SIZE, PTE_SIZE); - if (ptep = NULL) + if (ptep == NULL) early_pgtable_allocfail("pte"); @@ -865,12 +865,12 @@ static void __init srmmu_inherit_prom_mappings(unsigned long start, unsigned long *val; diff --git a/a/content_digest b/N1/content_digest index 1d93f0e..bdc2c98 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020200524162151.3493-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH 2/2] sparc32: srmmu: improve type safety of __nocache_fix()\0" - "Date\0Sun, 24 May 2020 16:21:51 +0000\0" + "Date\0Sun, 24 May 2020 19:21:51 +0300\0" "To\0David S. Miller <davem@davemloft.net>\0" "Cc\0Andrew Morton <akpm@linux-foundation.org>" Linus Torvalds <torvalds@linux-foundation.org> @@ -57,12 +57,12 @@ "-\t\tif (srmmu_pmd_none(*(pmd_t *)__nocache_fix(pmdp))) {\n" "+\t\tif (srmmu_pmd_none(*__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" " \t\t\t\tearly_pgtable_allocfail(\"pte\");\n" "@@ -836,11 +836,11 @@ static void __init srmmu_inherit_prom_mappings(unsigned long 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\t*__nocache_fix(pgdp) = __pgd(probed);\n" " \t\t\tstart += SRMMU_PGDIR_SIZE;\n" @@ -72,7 +72,7 @@ "+\t\tif (pud_none(*__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" "@@ -849,7 +849,7 @@ static void __init srmmu_inherit_prom_mappings(unsigned long start,\n" " \t\t\tpud_set(__nocache_fix(pudp), pmdp);\n" " \t\t}\n" @@ -80,7 +80,7 @@ "-\t\tif (srmmu_pmd_none(*(pmd_t *)__nocache_fix(pmdp))) {\n" "+\t\tif (srmmu_pmd_none(*__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" " \t\t\t\tearly_pgtable_allocfail(\"pte\");\n" "@@ -865,12 +865,12 @@ static void __init srmmu_inherit_prom_mappings(unsigned long start,\n" " \t\t\tunsigned long *val;\n" @@ -118,4 +118,4 @@ "-- \n" 2.26.2 -45551b8065f9d79a1d45d228be1c061f096bda4eac7044aa4dbfe066a493d9d0 +e4cfb340ce8cefa37fb8695f5548e36be93ab45528ed26dbb8d5caf0f224de46
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.