diff for duplicates of <20141016092529.GA1524@linaro.org> diff --git a/a/1.txt b/N1/1.txt index cea05e4..897aa35 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,69 +33,3 @@ With pgd_huge(x) defined, this patch passes my futex test on arm Cheers, -- Steve - - - -From 2fb7b0308f0aca94c50611257ba82d656abb0768 Mon Sep 17 00:00:00 2001 -From: Steve Capper <steve.capper@linaro.org> -Date: Thu, 16 Oct 2014 09:09:48 +0100 -Subject: [PATCH] Fixup for Update generic gup implementation - -The patch: -mm: Update generic gup implementation to handle hugepage directory - -will not compile for arm or arm64 due to pgd_huge being undefined. - -Signed-off-by: Steve Capper <steve.capper@linaro.org> ---- - arch/arm/include/asm/pgtable.h | 2 ++ - arch/arm64/include/asm/pgtable.h | 2 ++ - include/linux/hugetlb.h | 1 - - 3 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h -index 90aa4583..46f81fb 100644 ---- a/arch/arm/include/asm/pgtable.h -+++ b/arch/arm/include/asm/pgtable.h -@@ -181,6 +181,8 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; - /* to find an entry in a kernel page-table-directory */ - #define pgd_offset_k(addr) pgd_offset(&init_mm, addr) - -+#define pgd_huge(pgd) (0) -+ - #define pmd_none(pmd) (!pmd_val(pmd)) - #define pmd_present(pmd) (pmd_val(pmd)) - -diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h -index 464c5ce..d4462ca 100644 ---- a/arch/arm64/include/asm/pgtable.h -+++ b/arch/arm64/include/asm/pgtable.h -@@ -462,6 +462,8 @@ static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot) - extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; - extern pgd_t idmap_pg_dir[PTRS_PER_PGD]; - -+#define pgd_huge(pgd) (0) -+ - /* - * Encode and decode a swap entry: - * bits 0-1: present (must be zero) -diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h -index 65e12a2..6e6d338 100644 ---- a/include/linux/hugetlb.h -+++ b/include/linux/hugetlb.h -@@ -138,7 +138,6 @@ static inline void hugetlb_show_meminfo(void) - #define prepare_hugepage_range(file, addr, len) (-EINVAL) - #define pmd_huge(x) 0 - #define pud_huge(x) 0 --#define pgd_huge(x) 0 - #define is_hugepage_only_range(mm, addr, len) 0 - #define hugetlb_free_pgd_range(tlb, addr, end, floor, ceiling) ({BUG(); 0; }) - #define hugetlb_fault(mm, vma, addr, flags) ({ BUG(); 0; }) --- -1.9.3 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index 7cd0d5c..357fef7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -50,72 +50,6 @@ "\n" "Cheers,\n" "-- \n" - "Steve\n" - "\n" - "\n" - "\n" - "From 2fb7b0308f0aca94c50611257ba82d656abb0768 Mon Sep 17 00:00:00 2001\n" - "From: Steve Capper <steve.capper@linaro.org>\n" - "Date: Thu, 16 Oct 2014 09:09:48 +0100\n" - "Subject: [PATCH] Fixup for Update generic gup implementation\n" - "\n" - "The patch:\n" - "mm: Update generic gup implementation to handle hugepage directory\n" - "\n" - "will not compile for arm or arm64 due to pgd_huge being undefined.\n" - "\n" - "Signed-off-by: Steve Capper <steve.capper@linaro.org>\n" - "---\n" - " arch/arm/include/asm/pgtable.h | 2 ++\n" - " arch/arm64/include/asm/pgtable.h | 2 ++\n" - " include/linux/hugetlb.h | 1 -\n" - " 3 files changed, 4 insertions(+), 1 deletion(-)\n" - "\n" - "diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h\n" - "index 90aa4583..46f81fb 100644\n" - "--- a/arch/arm/include/asm/pgtable.h\n" - "+++ b/arch/arm/include/asm/pgtable.h\n" - "@@ -181,6 +181,8 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD];\n" - " /* to find an entry in a kernel page-table-directory */\n" - " #define pgd_offset_k(addr)\tpgd_offset(&init_mm, addr)\n" - " \n" - "+#define pgd_huge(pgd)\t\t(0)\n" - "+\n" - " #define pmd_none(pmd)\t\t(!pmd_val(pmd))\n" - " #define pmd_present(pmd)\t(pmd_val(pmd))\n" - " \n" - "diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h\n" - "index 464c5ce..d4462ca 100644\n" - "--- a/arch/arm64/include/asm/pgtable.h\n" - "+++ b/arch/arm64/include/asm/pgtable.h\n" - "@@ -462,6 +462,8 @@ static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)\n" - " extern pgd_t swapper_pg_dir[PTRS_PER_PGD];\n" - " extern pgd_t idmap_pg_dir[PTRS_PER_PGD];\n" - " \n" - "+#define pgd_huge(pgd)\t\t(0)\n" - "+\n" - " /*\n" - " * Encode and decode a swap entry:\n" - " *\tbits 0-1:\tpresent (must be zero)\n" - "diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h\n" - "index 65e12a2..6e6d338 100644\n" - "--- a/include/linux/hugetlb.h\n" - "+++ b/include/linux/hugetlb.h\n" - "@@ -138,7 +138,6 @@ static inline void hugetlb_show_meminfo(void)\n" - " #define prepare_hugepage_range(file, addr, len)\t(-EINVAL)\n" - " #define pmd_huge(x)\t0\n" - " #define pud_huge(x)\t0\n" - "-#define pgd_huge(x)\t0\n" - " #define is_hugepage_only_range(mm, addr, len)\t0\n" - " #define hugetlb_free_pgd_range(tlb, addr, end, floor, ceiling) ({BUG(); 0; })\n" - " #define hugetlb_fault(mm, vma, addr, flags)\t({ BUG(); 0; })\n" - "-- \n" - "1.9.3\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + Steve -faf7b497c4798e3f39c6d02687cb156af10e4fb69d2c6bb5b81cd24493f71cbd +8a887f658511159377a4e19ec79e32a29e6193737eb48dc91ee53b14a2374842
diff --git a/a/1.txt b/N2/1.txt index cea05e4..42b94ed 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -36,7 +36,7 @@ Steve -From 2fb7b0308f0aca94c50611257ba82d656abb0768 Mon Sep 17 00:00:00 2001 +>From 2fb7b0308f0aca94c50611257ba82d656abb0768 Mon Sep 17 00:00:00 2001 From: Steve Capper <steve.capper@linaro.org> Date: Thu, 16 Oct 2014 09:09:48 +0100 Subject: [PATCH] Fixup for Update generic gup implementation @@ -93,9 +93,3 @@ index 65e12a2..6e6d338 100644 #define hugetlb_fault(mm, vma, addr, flags) ({ BUG(); 0; }) -- 1.9.3 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N2/content_digest index 7cd0d5c..a124a2a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,17 +3,15 @@ "Subject\0Re: [PATCH 1/2] mm: Update generic gup implementation to handle hugepage directory\0" "Date\0Thu, 16 Oct 2014 10:25:30 +0100\0" "To\0Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>\0" - "Cc\0akpm@linux-foundation.org" - Andrea Arcangeli <aarcange@redhat.com> - benh@kernel.crashing.org - mpe@ellerman.id.au - linux-mm@kvack.org - linux-kernel@vger.kernel.org - linuxppc-dev@lists.ozlabs.org + "Cc\0Andrea Arcangeli <aarcange@redhat.com>" linux-arch@vger.kernel.org - will.deacon@arm.com catalin.marinas@arm.com - " linux@arm.linux.org.uk\0" + will.deacon@arm.com + linux-kernel@vger.kernel.org + linux-mm@kvack.org + linux@arm.linux.org.uk + akpm@linux-foundation.org + " linuxppc-dev@lists.ozlabs.org\0" "\00:1\0" "b\0" "On Wed, Oct 15, 2014 at 10:04:47PM +0530, Aneesh Kumar K.V wrote:\n" @@ -54,7 +52,7 @@ "\n" "\n" "\n" - "From 2fb7b0308f0aca94c50611257ba82d656abb0768 Mon Sep 17 00:00:00 2001\n" + ">From 2fb7b0308f0aca94c50611257ba82d656abb0768 Mon Sep 17 00:00:00 2001\n" "From: Steve Capper <steve.capper@linaro.org>\n" "Date: Thu, 16 Oct 2014 09:09:48 +0100\n" "Subject: [PATCH] Fixup for Update generic gup implementation\n" @@ -110,12 +108,6 @@ " #define hugetlb_free_pgd_range(tlb, addr, end, floor, ceiling) ({BUG(); 0; })\n" " #define hugetlb_fault(mm, vma, addr, flags)\t({ BUG(); 0; })\n" "-- \n" - "1.9.3\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + 1.9.3 -faf7b497c4798e3f39c6d02687cb156af10e4fb69d2c6bb5b81cd24493f71cbd +b0552ad18fc48f65dd934b3c43c81cb53c710aa7b06f0399cc9d06c82f6b6c63
diff --git a/a/1.txt b/N3/1.txt index cea05e4..42b94ed 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -36,7 +36,7 @@ Steve -From 2fb7b0308f0aca94c50611257ba82d656abb0768 Mon Sep 17 00:00:00 2001 +>From 2fb7b0308f0aca94c50611257ba82d656abb0768 Mon Sep 17 00:00:00 2001 From: Steve Capper <steve.capper@linaro.org> Date: Thu, 16 Oct 2014 09:09:48 +0100 Subject: [PATCH] Fixup for Update generic gup implementation @@ -93,9 +93,3 @@ index 65e12a2..6e6d338 100644 #define hugetlb_fault(mm, vma, addr, flags) ({ BUG(); 0; }) -- 1.9.3 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N3/content_digest index 7cd0d5c..750b000 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -54,7 +54,7 @@ "\n" "\n" "\n" - "From 2fb7b0308f0aca94c50611257ba82d656abb0768 Mon Sep 17 00:00:00 2001\n" + ">From 2fb7b0308f0aca94c50611257ba82d656abb0768 Mon Sep 17 00:00:00 2001\n" "From: Steve Capper <steve.capper@linaro.org>\n" "Date: Thu, 16 Oct 2014 09:09:48 +0100\n" "Subject: [PATCH] Fixup for Update generic gup implementation\n" @@ -110,12 +110,6 @@ " #define hugetlb_free_pgd_range(tlb, addr, end, floor, ceiling) ({BUG(); 0; })\n" " #define hugetlb_fault(mm, vma, addr, flags)\t({ BUG(); 0; })\n" "-- \n" - "1.9.3\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + 1.9.3 -faf7b497c4798e3f39c6d02687cb156af10e4fb69d2c6bb5b81cd24493f71cbd +24171d8c93aae6b8098603d6614717dbdec696b20091f834af5653b4832a6edd
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.