diff for duplicates of <20180823232704.GA4487@brain-police> diff --git a/a/1.txt b/N1/1.txt index 942c1b0..1b5f654 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,35 +30,3 @@ Cheers, Will --->8 - -From 48ea452db90a91ff2b62a94277daf565e715a126 Mon Sep 17 00:00:00 2001 -From: Will Deacon <will.deacon@arm.com> -Date: Fri, 24 Aug 2018 00:23:04 +0100 -Subject: [PATCH] arm64: tlb: Provide forward declaration of tlb_flush() before - including tlb.h - -As of commit fd1102f0aade ("mm: mmu_notifier fix for tlb_end_vma"), -asm-generic/tlb.h now calls tlb_flush() from a static inline function, -so we need to make sure that it's declared before #including the -asm-generic header in the arch header. - -Signed-off-by: Will Deacon <will.deacon@arm.com> ---- - arch/arm64/include/asm/tlb.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/arm64/include/asm/tlb.h b/arch/arm64/include/asm/tlb.h -index 0ad1cf233470..a3233167be60 100644 ---- a/arch/arm64/include/asm/tlb.h -+++ b/arch/arm64/include/asm/tlb.h -@@ -33,6 +33,8 @@ static inline void __tlb_remove_table(void *_table) - #define tlb_remove_entry(tlb, entry) tlb_remove_page(tlb, entry) - #endif /* CONFIG_HAVE_RCU_TABLE_FREE */ - -+static void tlb_flush(struct mmu_gather *tlb); -+ - #include <asm-generic/tlb.h> - - static inline void tlb_flush(struct mmu_gather *tlb) --- -2.7.4 diff --git a/a/content_digest b/N1/content_digest index 9277f44..752a426 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -53,38 +53,6 @@ "\n" "Will\n" "\n" - "--->8\n" - "\n" - "From 48ea452db90a91ff2b62a94277daf565e715a126 Mon Sep 17 00:00:00 2001\n" - "From: Will Deacon <will.deacon@arm.com>\n" - "Date: Fri, 24 Aug 2018 00:23:04 +0100\n" - "Subject: [PATCH] arm64: tlb: Provide forward declaration of tlb_flush() before\n" - " including tlb.h\n" - "\n" - "As of commit fd1102f0aade (\"mm: mmu_notifier fix for tlb_end_vma\"),\n" - "asm-generic/tlb.h now calls tlb_flush() from a static inline function,\n" - "so we need to make sure that it's declared before #including the\n" - "asm-generic header in the arch header.\n" - "\n" - "Signed-off-by: Will Deacon <will.deacon@arm.com>\n" - "---\n" - " arch/arm64/include/asm/tlb.h | 2 ++\n" - " 1 file changed, 2 insertions(+)\n" - "\n" - "diff --git a/arch/arm64/include/asm/tlb.h b/arch/arm64/include/asm/tlb.h\n" - "index 0ad1cf233470..a3233167be60 100644\n" - "--- a/arch/arm64/include/asm/tlb.h\n" - "+++ b/arch/arm64/include/asm/tlb.h\n" - "@@ -33,6 +33,8 @@ static inline void __tlb_remove_table(void *_table)\n" - " #define tlb_remove_entry(tlb, entry)\ttlb_remove_page(tlb, entry)\n" - " #endif /* CONFIG_HAVE_RCU_TABLE_FREE */\n" - " \n" - "+static void tlb_flush(struct mmu_gather *tlb);\n" - "+\n" - " #include <asm-generic/tlb.h>\n" - " \n" - " static inline void tlb_flush(struct mmu_gather *tlb)\n" - "-- \n" - 2.7.4 + --->8 -d170c5f9adee7440e4dbe355f7a8f56060c5c18dec96ad870d42c97b9f67b4c3 +c5f3c6ab102acd0ad1596f9f9d9f70655e19773c536febb120f47498c6cd2ec6
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox