diff for duplicates of <43A0FE0D.6030100@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 43c9267..96a095d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,8 @@ Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> 5 files changed, 11 insertions(+), 10 deletions(-) Index: linux-2.6.15-rc5-mm2/arch/ia64/kernel/smpboot.c -=================================--- linux-2.6.15-rc5-mm2.orig/arch/ia64/kernel/smpboot.c +=================================================================== +--- linux-2.6.15-rc5-mm2.orig/arch/ia64/kernel/smpboot.c +++ linux-2.6.15-rc5-mm2/arch/ia64/kernel/smpboot.c @@ -652,7 +652,7 @@ int __cpu_disable(void) remove_siblinginfo(cpu); @@ -39,7 +40,8 @@ Index: linux-2.6.15-rc5-mm2/arch/ia64/kernel/smpboot.c return 0; } Index: linux-2.6.15-rc5-mm2/arch/ia64/mm/tlb.c -=================================--- linux-2.6.15-rc5-mm2.orig/arch/ia64/mm/tlb.c +=================================================================== +--- linux-2.6.15-rc5-mm2.orig/arch/ia64/mm/tlb.c +++ linux-2.6.15-rc5-mm2/arch/ia64/mm/tlb.c @@ -81,7 +81,7 @@ wrap_mmu_context (struct mm_struct *mm) if (i != cpu) @@ -67,7 +69,8 @@ Index: linux-2.6.15-rc5-mm2/arch/ia64/mm/tlb.c + local_flush_tlb_all(NULL);/* nuke left overs from bootstrapping... */ } Index: linux-2.6.15-rc5-mm2/arch/ia64/kernel/smp.c -=================================--- linux-2.6.15-rc5-mm2.orig/arch/ia64/kernel/smp.c +=================================================================== +--- linux-2.6.15-rc5-mm2.orig/arch/ia64/kernel/smp.c +++ linux-2.6.15-rc5-mm2/arch/ia64/kernel/smp.c @@ -225,7 +225,7 @@ smp_send_reschedule (int cpu) void @@ -88,7 +91,8 @@ Index: linux-2.6.15-rc5-mm2/arch/ia64/kernel/smp.c /* Index: linux-2.6.15-rc5-mm2/include/asm-ia64/tlbflush.h -=================================--- linux-2.6.15-rc5-mm2.orig/include/asm-ia64/tlbflush.h +=================================================================== +--- linux-2.6.15-rc5-mm2.orig/include/asm-ia64/tlbflush.h +++ linux-2.6.15-rc5-mm2/include/asm-ia64/tlbflush.h @@ -23,7 +23,7 @@ * Flush everything (kernel mapping may also have changed due to @@ -107,11 +111,12 @@ Index: linux-2.6.15-rc5-mm2/include/asm-ia64/tlbflush.h +local_finish_flush_tlb_mm (void *info) { + struct mm_struct *mm = (struct mm_struct *)info; - if (mm = current->active_mm) + if (mm == current->active_mm) activate_context(mm); } Index: linux-2.6.15-rc5-mm2/include/asm-ia64/mmu_context.h -=================================--- linux-2.6.15-rc5-mm2.orig/include/asm-ia64/mmu_context.h +=================================================================== +--- linux-2.6.15-rc5-mm2.orig/include/asm-ia64/mmu_context.h +++ linux-2.6.15-rc5-mm2/include/asm-ia64/mmu_context.h @@ -60,13 +60,13 @@ enter_lazy_tlb (struct mm_struct *mm, st static inline void diff --git a/a/content_digest b/N1/content_digest index fb94cee..9623ae0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020051215030040.GA28660@kvack.org\0" "From\0Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>\0" "Subject\0Re: 2.6.15-rc5-mm2 can't boot on ia64 due to changing on_each_cpu().\0" - "Date\0Thu, 15 Dec 2005 05:24:29 +0000\0" + "Date\0Thu, 15 Dec 2005 14:24:29 +0900\0" "To\0Benjamin LaHaise <bcrl@kvack.org>\0" "Cc\0Andrew Morton <akpm@osdl.org>" Yasunori Goto <y-goto@jp.fujitsu.com> @@ -42,7 +42,8 @@ " 5 files changed, 11 insertions(+), 10 deletions(-)\n" "\n" "Index: linux-2.6.15-rc5-mm2/arch/ia64/kernel/smpboot.c\n" - "=================================--- linux-2.6.15-rc5-mm2.orig/arch/ia64/kernel/smpboot.c\n" + "===================================================================\n" + "--- linux-2.6.15-rc5-mm2.orig/arch/ia64/kernel/smpboot.c\n" "+++ linux-2.6.15-rc5-mm2/arch/ia64/kernel/smpboot.c\n" "@@ -652,7 +652,7 @@ int __cpu_disable(void)\n" " \tremove_siblinginfo(cpu);\n" @@ -54,7 +55,8 @@ " \treturn 0;\n" " }\n" "Index: linux-2.6.15-rc5-mm2/arch/ia64/mm/tlb.c\n" - "=================================--- linux-2.6.15-rc5-mm2.orig/arch/ia64/mm/tlb.c\n" + "===================================================================\n" + "--- linux-2.6.15-rc5-mm2.orig/arch/ia64/mm/tlb.c\n" "+++ linux-2.6.15-rc5-mm2/arch/ia64/mm/tlb.c\n" "@@ -81,7 +81,7 @@ wrap_mmu_context (struct mm_struct *mm)\n" " \t\tif (i != cpu)\n" @@ -82,7 +84,8 @@ "+\tlocal_flush_tlb_all(NULL);/* nuke left overs from bootstrapping... */\n" " }\n" "Index: linux-2.6.15-rc5-mm2/arch/ia64/kernel/smp.c\n" - "=================================--- linux-2.6.15-rc5-mm2.orig/arch/ia64/kernel/smp.c\n" + "===================================================================\n" + "--- linux-2.6.15-rc5-mm2.orig/arch/ia64/kernel/smp.c\n" "+++ linux-2.6.15-rc5-mm2/arch/ia64/kernel/smp.c\n" "@@ -225,7 +225,7 @@ smp_send_reschedule (int cpu)\n" " void\n" @@ -103,7 +106,8 @@ " \n" " /*\n" "Index: linux-2.6.15-rc5-mm2/include/asm-ia64/tlbflush.h\n" - "=================================--- linux-2.6.15-rc5-mm2.orig/include/asm-ia64/tlbflush.h\n" + "===================================================================\n" + "--- linux-2.6.15-rc5-mm2.orig/include/asm-ia64/tlbflush.h\n" "+++ linux-2.6.15-rc5-mm2/include/asm-ia64/tlbflush.h\n" "@@ -23,7 +23,7 @@\n" " * Flush everything (kernel mapping may also have changed due to\n" @@ -122,11 +126,12 @@ "+local_finish_flush_tlb_mm (void *info)\n" " {\n" "+\tstruct mm_struct *mm = (struct mm_struct *)info;\n" - " \tif (mm = current->active_mm)\n" + " \tif (mm == current->active_mm)\n" " \t\tactivate_context(mm);\n" " }\n" "Index: linux-2.6.15-rc5-mm2/include/asm-ia64/mmu_context.h\n" - "=================================--- linux-2.6.15-rc5-mm2.orig/include/asm-ia64/mmu_context.h\n" + "===================================================================\n" + "--- linux-2.6.15-rc5-mm2.orig/include/asm-ia64/mmu_context.h\n" "+++ linux-2.6.15-rc5-mm2/include/asm-ia64/mmu_context.h\n" "@@ -60,13 +60,13 @@ enter_lazy_tlb (struct mm_struct *mm, st\n" " static inline void\n" @@ -145,4 +150,4 @@ " \t\t}\n" " \t\tspin_unlock_irqrestore(&ia64_ctx.lock, flags);" -ac12dcd240a6c785cadee3355be486c0d8ce6c3c699412e12b1099684abd245e +1fa81395fea6d12bb2b12edff4eb379057f1494fa258a3412d049ea278b05819
diff --git a/a/1.txt b/N2/1.txt index 43c9267..0c434cf 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -27,7 +27,8 @@ Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> 5 files changed, 11 insertions(+), 10 deletions(-) Index: linux-2.6.15-rc5-mm2/arch/ia64/kernel/smpboot.c -=================================--- linux-2.6.15-rc5-mm2.orig/arch/ia64/kernel/smpboot.c +=================================================================== +--- linux-2.6.15-rc5-mm2.orig/arch/ia64/kernel/smpboot.c +++ linux-2.6.15-rc5-mm2/arch/ia64/kernel/smpboot.c @@ -652,7 +652,7 @@ int __cpu_disable(void) remove_siblinginfo(cpu); @@ -39,7 +40,8 @@ Index: linux-2.6.15-rc5-mm2/arch/ia64/kernel/smpboot.c return 0; } Index: linux-2.6.15-rc5-mm2/arch/ia64/mm/tlb.c -=================================--- linux-2.6.15-rc5-mm2.orig/arch/ia64/mm/tlb.c +=================================================================== +--- linux-2.6.15-rc5-mm2.orig/arch/ia64/mm/tlb.c +++ linux-2.6.15-rc5-mm2/arch/ia64/mm/tlb.c @@ -81,7 +81,7 @@ wrap_mmu_context (struct mm_struct *mm) if (i != cpu) @@ -67,7 +69,8 @@ Index: linux-2.6.15-rc5-mm2/arch/ia64/mm/tlb.c + local_flush_tlb_all(NULL);/* nuke left overs from bootstrapping... */ } Index: linux-2.6.15-rc5-mm2/arch/ia64/kernel/smp.c -=================================--- linux-2.6.15-rc5-mm2.orig/arch/ia64/kernel/smp.c +=================================================================== +--- linux-2.6.15-rc5-mm2.orig/arch/ia64/kernel/smp.c +++ linux-2.6.15-rc5-mm2/arch/ia64/kernel/smp.c @@ -225,7 +225,7 @@ smp_send_reschedule (int cpu) void @@ -88,7 +91,8 @@ Index: linux-2.6.15-rc5-mm2/arch/ia64/kernel/smp.c /* Index: linux-2.6.15-rc5-mm2/include/asm-ia64/tlbflush.h -=================================--- linux-2.6.15-rc5-mm2.orig/include/asm-ia64/tlbflush.h +=================================================================== +--- linux-2.6.15-rc5-mm2.orig/include/asm-ia64/tlbflush.h +++ linux-2.6.15-rc5-mm2/include/asm-ia64/tlbflush.h @@ -23,7 +23,7 @@ * Flush everything (kernel mapping may also have changed due to @@ -107,11 +111,12 @@ Index: linux-2.6.15-rc5-mm2/include/asm-ia64/tlbflush.h +local_finish_flush_tlb_mm (void *info) { + struct mm_struct *mm = (struct mm_struct *)info; - if (mm = current->active_mm) + if (mm == current->active_mm) activate_context(mm); } Index: linux-2.6.15-rc5-mm2/include/asm-ia64/mmu_context.h -=================================--- linux-2.6.15-rc5-mm2.orig/include/asm-ia64/mmu_context.h +=================================================================== +--- linux-2.6.15-rc5-mm2.orig/include/asm-ia64/mmu_context.h +++ linux-2.6.15-rc5-mm2/include/asm-ia64/mmu_context.h @@ -60,13 +60,13 @@ enter_lazy_tlb (struct mm_struct *mm, st static inline void @@ -129,3 +134,10 @@ Index: linux-2.6.15-rc5-mm2/include/asm-ia64/mmu_context.h __ia64_per_cpu_var(ia64_need_tlb_flush) = 0; } spin_unlock_irqrestore(&ia64_ctx.lock, flags); + + +-- +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 fb94cee..8177094 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "ref\020051215030040.GA28660@kvack.org\0" "From\0Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>\0" "Subject\0Re: 2.6.15-rc5-mm2 can't boot on ia64 due to changing on_each_cpu().\0" - "Date\0Thu, 15 Dec 2005 05:24:29 +0000\0" + "Date\0Thu, 15 Dec 2005 14:24:29 +0900\0" "To\0Benjamin LaHaise <bcrl@kvack.org>\0" "Cc\0Andrew Morton <akpm@osdl.org>" Yasunori Goto <y-goto@jp.fujitsu.com> @@ -42,7 +42,8 @@ " 5 files changed, 11 insertions(+), 10 deletions(-)\n" "\n" "Index: linux-2.6.15-rc5-mm2/arch/ia64/kernel/smpboot.c\n" - "=================================--- linux-2.6.15-rc5-mm2.orig/arch/ia64/kernel/smpboot.c\n" + "===================================================================\n" + "--- linux-2.6.15-rc5-mm2.orig/arch/ia64/kernel/smpboot.c\n" "+++ linux-2.6.15-rc5-mm2/arch/ia64/kernel/smpboot.c\n" "@@ -652,7 +652,7 @@ int __cpu_disable(void)\n" " \tremove_siblinginfo(cpu);\n" @@ -54,7 +55,8 @@ " \treturn 0;\n" " }\n" "Index: linux-2.6.15-rc5-mm2/arch/ia64/mm/tlb.c\n" - "=================================--- linux-2.6.15-rc5-mm2.orig/arch/ia64/mm/tlb.c\n" + "===================================================================\n" + "--- linux-2.6.15-rc5-mm2.orig/arch/ia64/mm/tlb.c\n" "+++ linux-2.6.15-rc5-mm2/arch/ia64/mm/tlb.c\n" "@@ -81,7 +81,7 @@ wrap_mmu_context (struct mm_struct *mm)\n" " \t\tif (i != cpu)\n" @@ -82,7 +84,8 @@ "+\tlocal_flush_tlb_all(NULL);/* nuke left overs from bootstrapping... */\n" " }\n" "Index: linux-2.6.15-rc5-mm2/arch/ia64/kernel/smp.c\n" - "=================================--- linux-2.6.15-rc5-mm2.orig/arch/ia64/kernel/smp.c\n" + "===================================================================\n" + "--- linux-2.6.15-rc5-mm2.orig/arch/ia64/kernel/smp.c\n" "+++ linux-2.6.15-rc5-mm2/arch/ia64/kernel/smp.c\n" "@@ -225,7 +225,7 @@ smp_send_reschedule (int cpu)\n" " void\n" @@ -103,7 +106,8 @@ " \n" " /*\n" "Index: linux-2.6.15-rc5-mm2/include/asm-ia64/tlbflush.h\n" - "=================================--- linux-2.6.15-rc5-mm2.orig/include/asm-ia64/tlbflush.h\n" + "===================================================================\n" + "--- linux-2.6.15-rc5-mm2.orig/include/asm-ia64/tlbflush.h\n" "+++ linux-2.6.15-rc5-mm2/include/asm-ia64/tlbflush.h\n" "@@ -23,7 +23,7 @@\n" " * Flush everything (kernel mapping may also have changed due to\n" @@ -122,11 +126,12 @@ "+local_finish_flush_tlb_mm (void *info)\n" " {\n" "+\tstruct mm_struct *mm = (struct mm_struct *)info;\n" - " \tif (mm = current->active_mm)\n" + " \tif (mm == current->active_mm)\n" " \t\tactivate_context(mm);\n" " }\n" "Index: linux-2.6.15-rc5-mm2/include/asm-ia64/mmu_context.h\n" - "=================================--- linux-2.6.15-rc5-mm2.orig/include/asm-ia64/mmu_context.h\n" + "===================================================================\n" + "--- linux-2.6.15-rc5-mm2.orig/include/asm-ia64/mmu_context.h\n" "+++ linux-2.6.15-rc5-mm2/include/asm-ia64/mmu_context.h\n" "@@ -60,13 +60,13 @@ enter_lazy_tlb (struct mm_struct *mm, st\n" " static inline void\n" @@ -143,6 +148,13 @@ "+\t\t\tlocal_flush_tlb_all(NULL);\n" " \t\t\t__ia64_per_cpu_var(ia64_need_tlb_flush) = 0;\n" " \t\t}\n" - " \t\tspin_unlock_irqrestore(&ia64_ctx.lock, flags);" + " \t\tspin_unlock_irqrestore(&ia64_ctx.lock, flags);\n" + "\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>" -ac12dcd240a6c785cadee3355be486c0d8ce6c3c699412e12b1099684abd245e +2774d27426cc927646b4645744fad6ea8c1552712a51fac76ce62ea1248e963a
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.