diff for duplicates of <20180824133427.GC11868@brain-police> diff --git a/a/1.txt b/N1/1.txt index 92e100f..e639deb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -38,46 +38,3 @@ toolchain yet. Will --->8 - -From adb9be33d68320edcda80d540a97a647792894d2 Mon Sep 17 00:00:00 2001 -From: Will Deacon <will.deacon@arm.com> -Date: Fri, 24 Aug 2018 14:33:48 +0100 -Subject: [PATCH] riscv: tlb: Provide definition 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. - -Since tlb_flush() is a one-liner for riscv, we can define it before -including asm-generic/tlb.h as long as we provide a forward declaration -of struct mmu_gather. - -Reported-by: Guenter Roeck <linux@roeck-us.net> -Signed-off-by: Will Deacon <will.deacon@arm.com> ---- - arch/riscv/include/asm/tlb.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/arch/riscv/include/asm/tlb.h b/arch/riscv/include/asm/tlb.h -index c229509288ea..a3d1380ad970 100644 ---- a/arch/riscv/include/asm/tlb.h -+++ b/arch/riscv/include/asm/tlb.h -@@ -14,11 +14,13 @@ - #ifndef _ASM_RISCV_TLB_H - #define _ASM_RISCV_TLB_H - --#include <asm-generic/tlb.h> -+struct mmu_gather; - - static inline void tlb_flush(struct mmu_gather *tlb) - { - flush_tlb_mm(tlb->mm); - } - -+#include <asm-generic/tlb.h> -+ - #endif /* _ASM_RISCV_TLB_H */ --- -2.7.4 diff --git a/a/content_digest b/N1/content_digest index 0bdbd3f..844dda7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -66,49 +66,6 @@ "\n" "Will\n" "\n" - "--->8\n" - "\n" - "From adb9be33d68320edcda80d540a97a647792894d2 Mon Sep 17 00:00:00 2001\n" - "From: Will Deacon <will.deacon@arm.com>\n" - "Date: Fri, 24 Aug 2018 14:33:48 +0100\n" - "Subject: [PATCH] riscv: tlb: Provide definition 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" - "Since tlb_flush() is a one-liner for riscv, we can define it before\n" - "including asm-generic/tlb.h as long as we provide a forward declaration\n" - "of struct mmu_gather.\n" - "\n" - "Reported-by: Guenter Roeck <linux@roeck-us.net>\n" - "Signed-off-by: Will Deacon <will.deacon@arm.com>\n" - "---\n" - " arch/riscv/include/asm/tlb.h | 4 +++-\n" - " 1 file changed, 3 insertions(+), 1 deletion(-)\n" - "\n" - "diff --git a/arch/riscv/include/asm/tlb.h b/arch/riscv/include/asm/tlb.h\n" - "index c229509288ea..a3d1380ad970 100644\n" - "--- a/arch/riscv/include/asm/tlb.h\n" - "+++ b/arch/riscv/include/asm/tlb.h\n" - "@@ -14,11 +14,13 @@\n" - " #ifndef _ASM_RISCV_TLB_H\n" - " #define _ASM_RISCV_TLB_H\n" - " \n" - "-#include <asm-generic/tlb.h>\n" - "+struct mmu_gather;\n" - " \n" - " static inline void tlb_flush(struct mmu_gather *tlb)\n" - " {\n" - " \tflush_tlb_mm(tlb->mm);\n" - " }\n" - " \n" - "+#include <asm-generic/tlb.h>\n" - "+\n" - " #endif /* _ASM_RISCV_TLB_H */\n" - "-- \n" - 2.7.4 + --->8 -038a53aa1f1e8ee47cd8968661fc2b9b6c0d2a8e53ea17271a3d67a8b3e099a7 +8cff932cd9402ee5b6f46ce7d2fda3137d17451983f3da9f606cd058481a2c55
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox