diff for duplicates of <1522234731-27397-2-git-send-email-cpandya@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index d4b4b42..d538310 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,119 +14,3 @@ can be performed. Signed-off-by: Chintan Pandya <cpandya@codeaurora.org> --- - -From V4->V6: - - No change - - arch/arm64/mm/mmu.c | 4 ++-- - arch/x86/mm/pgtable.c | 6 ++++-- - include/asm-generic/pgtable.h | 8 ++++---- - lib/ioremap.c | 4 ++-- - 4 files changed, 12 insertions(+), 10 deletions(-) - -diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c -index 2dbb2c9..da98828 100644 ---- a/arch/arm64/mm/mmu.c -+++ b/arch/arm64/mm/mmu.c -@@ -973,12 +973,12 @@ int pmd_clear_huge(pmd_t *pmdp) - return 1; - } - --int pud_free_pmd_page(pud_t *pud) -+int pud_free_pmd_page(pud_t *pud, unsigned long addr) - { - return pud_none(*pud); - } - --int pmd_free_pte_page(pmd_t *pmd) -+int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) - { - return pmd_none(*pmd); - } -diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c -index 34cda7e..f640ba3 100644 ---- a/arch/x86/mm/pgtable.c -+++ b/arch/x86/mm/pgtable.c -@@ -706,11 +706,12 @@ int pmd_clear_huge(pmd_t *pmd) - /** - * pud_free_pmd_page - Clear pud entry and free pmd page. - * @pud: Pointer to a PUD. -+ * @addr: Virtual address associated with pud. - * - * Context: The pud range has been unmaped and TLB purged. - * Return: 1 if clearing the entry succeeded. 0 otherwise. - */ --int pud_free_pmd_page(pud_t *pud) -+int pud_free_pmd_page(pud_t *pud, unsigned long addr) - { - pmd_t *pmd; - int i; -@@ -733,11 +734,12 @@ int pud_free_pmd_page(pud_t *pud) - /** - * pmd_free_pte_page - Clear pmd entry and free pte page. - * @pmd: Pointer to a PMD. -+ * @addr: Virtual address associated with pmd. - * - * Context: The pmd range has been unmaped and TLB purged. - * Return: 1 if clearing the entry succeeded. 0 otherwise. - */ --int pmd_free_pte_page(pmd_t *pmd) -+int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) - { - pte_t *pte; - -diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h -index bfbb44a..e6310f4 100644 ---- a/include/asm-generic/pgtable.h -+++ b/include/asm-generic/pgtable.h -@@ -983,8 +983,8 @@ static inline int p4d_clear_huge(p4d_t *p4d) - int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot); - int pud_clear_huge(pud_t *pud); - int pmd_clear_huge(pmd_t *pmd); --int pud_free_pmd_page(pud_t *pud); --int pmd_free_pte_page(pmd_t *pmd); -+int pud_free_pmd_page(pud_t *pud, unsigned long addr); -+int pmd_free_pte_page(pmd_t *pmd, unsigned long addr); - #else /* !CONFIG_HAVE_ARCH_HUGE_VMAP */ - static inline int p4d_set_huge(p4d_t *p4d, phys_addr_t addr, pgprot_t prot) - { -@@ -1010,11 +1010,11 @@ static inline int pmd_clear_huge(pmd_t *pmd) - { - return 0; - } --static inline int pud_free_pmd_page(pud_t *pud) -+static inline int pud_free_pmd_page(pud_t *pud, unsigned long addr) - { - return 0; - } --static inline int pmd_free_pte_page(pmd_t *pmd) -+static inline int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) - { - return 0; - } -diff --git a/lib/ioremap.c b/lib/ioremap.c -index 54e5bba..517f585 100644 ---- a/lib/ioremap.c -+++ b/lib/ioremap.c -@@ -92,7 +92,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr, - if (ioremap_pmd_enabled() && - ((next - addr) == PMD_SIZE) && - IS_ALIGNED(phys_addr + addr, PMD_SIZE) && -- pmd_free_pte_page(pmd)) { -+ pmd_free_pte_page(pmd, addr)) { - if (pmd_set_huge(pmd, phys_addr + addr, prot)) - continue; - } -@@ -119,7 +119,7 @@ static inline int ioremap_pud_range(p4d_t *p4d, unsigned long addr, - if (ioremap_pud_enabled() && - ((next - addr) == PUD_SIZE) && - IS_ALIGNED(phys_addr + addr, PUD_SIZE) && -- pud_free_pmd_page(pud)) { -+ pud_free_pmd_page(pud, addr)) { - if (pud_set_huge(pud, phys_addr + addr, prot)) - continue; - } --- -Qualcomm India Private Limited, on behalf of Qualcomm Innovation -Center, Inc., is a member of Code Aurora Forum, a Linux Foundation -Collaborative Project diff --git a/a/content_digest b/N1/content_digest index 2a205ff..375b4f0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -36,122 +36,6 @@ "can be performed.\n" "\n" "Signed-off-by: Chintan Pandya <cpandya@codeaurora.org>\n" - "---\n" - "\n" - "From V4->V6:\n" - " - No change\n" - "\n" - " arch/arm64/mm/mmu.c | 4 ++--\n" - " arch/x86/mm/pgtable.c | 6 ++++--\n" - " include/asm-generic/pgtable.h | 8 ++++----\n" - " lib/ioremap.c | 4 ++--\n" - " 4 files changed, 12 insertions(+), 10 deletions(-)\n" - "\n" - "diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c\n" - "index 2dbb2c9..da98828 100644\n" - "--- a/arch/arm64/mm/mmu.c\n" - "+++ b/arch/arm64/mm/mmu.c\n" - "@@ -973,12 +973,12 @@ int pmd_clear_huge(pmd_t *pmdp)\n" - " \treturn 1;\n" - " }\n" - " \n" - "-int pud_free_pmd_page(pud_t *pud)\n" - "+int pud_free_pmd_page(pud_t *pud, unsigned long addr)\n" - " {\n" - " \treturn pud_none(*pud);\n" - " }\n" - " \n" - "-int pmd_free_pte_page(pmd_t *pmd)\n" - "+int pmd_free_pte_page(pmd_t *pmd, unsigned long addr)\n" - " {\n" - " \treturn pmd_none(*pmd);\n" - " }\n" - "diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c\n" - "index 34cda7e..f640ba3 100644\n" - "--- a/arch/x86/mm/pgtable.c\n" - "+++ b/arch/x86/mm/pgtable.c\n" - "@@ -706,11 +706,12 @@ int pmd_clear_huge(pmd_t *pmd)\n" - " /**\n" - " * pud_free_pmd_page - Clear pud entry and free pmd page.\n" - " * @pud: Pointer to a PUD.\n" - "+ * @addr: Virtual address associated with pud.\n" - " *\n" - " * Context: The pud range has been unmaped and TLB purged.\n" - " * Return: 1 if clearing the entry succeeded. 0 otherwise.\n" - " */\n" - "-int pud_free_pmd_page(pud_t *pud)\n" - "+int pud_free_pmd_page(pud_t *pud, unsigned long addr)\n" - " {\n" - " \tpmd_t *pmd;\n" - " \tint i;\n" - "@@ -733,11 +734,12 @@ int pud_free_pmd_page(pud_t *pud)\n" - " /**\n" - " * pmd_free_pte_page - Clear pmd entry and free pte page.\n" - " * @pmd: Pointer to a PMD.\n" - "+ * @addr: Virtual address associated with pmd.\n" - " *\n" - " * Context: The pmd range has been unmaped and TLB purged.\n" - " * Return: 1 if clearing the entry succeeded. 0 otherwise.\n" - " */\n" - "-int pmd_free_pte_page(pmd_t *pmd)\n" - "+int pmd_free_pte_page(pmd_t *pmd, unsigned long addr)\n" - " {\n" - " \tpte_t *pte;\n" - " \n" - "diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h\n" - "index bfbb44a..e6310f4 100644\n" - "--- a/include/asm-generic/pgtable.h\n" - "+++ b/include/asm-generic/pgtable.h\n" - "@@ -983,8 +983,8 @@ static inline int p4d_clear_huge(p4d_t *p4d)\n" - " int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot);\n" - " int pud_clear_huge(pud_t *pud);\n" - " int pmd_clear_huge(pmd_t *pmd);\n" - "-int pud_free_pmd_page(pud_t *pud);\n" - "-int pmd_free_pte_page(pmd_t *pmd);\n" - "+int pud_free_pmd_page(pud_t *pud, unsigned long addr);\n" - "+int pmd_free_pte_page(pmd_t *pmd, unsigned long addr);\n" - " #else\t/* !CONFIG_HAVE_ARCH_HUGE_VMAP */\n" - " static inline int p4d_set_huge(p4d_t *p4d, phys_addr_t addr, pgprot_t prot)\n" - " {\n" - "@@ -1010,11 +1010,11 @@ static inline int pmd_clear_huge(pmd_t *pmd)\n" - " {\n" - " \treturn 0;\n" - " }\n" - "-static inline int pud_free_pmd_page(pud_t *pud)\n" - "+static inline int pud_free_pmd_page(pud_t *pud, unsigned long addr)\n" - " {\n" - " \treturn 0;\n" - " }\n" - "-static inline int pmd_free_pte_page(pmd_t *pmd)\n" - "+static inline int pmd_free_pte_page(pmd_t *pmd, unsigned long addr)\n" - " {\n" - " \treturn 0;\n" - " }\n" - "diff --git a/lib/ioremap.c b/lib/ioremap.c\n" - "index 54e5bba..517f585 100644\n" - "--- a/lib/ioremap.c\n" - "+++ b/lib/ioremap.c\n" - "@@ -92,7 +92,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,\n" - " \t\tif (ioremap_pmd_enabled() &&\n" - " \t\t ((next - addr) == PMD_SIZE) &&\n" - " \t\t IS_ALIGNED(phys_addr + addr, PMD_SIZE) &&\n" - "-\t\t pmd_free_pte_page(pmd)) {\n" - "+\t\t pmd_free_pte_page(pmd, addr)) {\n" - " \t\t\tif (pmd_set_huge(pmd, phys_addr + addr, prot))\n" - " \t\t\t\tcontinue;\n" - " \t\t}\n" - "@@ -119,7 +119,7 @@ static inline int ioremap_pud_range(p4d_t *p4d, unsigned long addr,\n" - " \t\tif (ioremap_pud_enabled() &&\n" - " \t\t ((next - addr) == PUD_SIZE) &&\n" - " \t\t IS_ALIGNED(phys_addr + addr, PUD_SIZE) &&\n" - "-\t\t pud_free_pmd_page(pud)) {\n" - "+\t\t pud_free_pmd_page(pud, addr)) {\n" - " \t\t\tif (pud_set_huge(pud, phys_addr + addr, prot))\n" - " \t\t\t\tcontinue;\n" - " \t\t}\n" - "-- \n" - "Qualcomm India Private Limited, on behalf of Qualcomm Innovation\n" - "Center, Inc., is a member of Code Aurora Forum, a Linux Foundation\n" - Collaborative Project + --- -53ad34b40f582292d551af8282c95b8ffa26b8df9d42040af7f32fe921ee0978 +fd8d3e59a59722cceda916a1131595b4baf56c19078de37a085397adde0904b0
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox