diff for duplicates of <Y92mP1GT28KfnPEQ@ZenIV>
diff --git a/a/1.txt b/N1/1.txt
index fdb6d18..557644d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -287,4 +287,9 @@ no_context:
}
return 0;
-}
\ No newline at end of file
+}
+
+_______________________________________________
+linux-riscv mailing list
+linux-riscv@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-riscv
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index ec633aa..19d9b4b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -347,7 +347,12 @@
"\t}\n",
"\n",
"\treturn 0;\n",
- "}"
+ "}\n",
+ "\n",
+ "_______________________________________________\n",
+ "linux-riscv mailing list\n",
+ "linux-riscv\@lists.infradead.org\n",
+ "http://lists.infradead.org/mailman/listinfo/linux-riscv"
]
-b0f1048c41a0ad6b98983d58f1033448e411bfdb90240337c494944a8e1214ad
+920587212d6c3890837d4c83feef4864f89c7e75d305c35ec972f5f39da307db
diff --git a/a/1.txt b/N2/1.txt
index fdb6d18..85338d8 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -100,7 +100,7 @@ retry:
return SIGBUS;
if (fault & VM_FAULT_HWPOISON)
- return POISON + PAGE_SHIFT; // POISON == 256
+ return POISON + PAGE_SHIFT; // POISON = 256
if (fault & VM_FAULT_HWPOISON_LARGE)
return POISON + hstate_index_to_shift(VM_FAULT_GET_HINDEX(fault));
@@ -174,17 +174,17 @@ arc:
if (regs->ecr_cause & ECR_C_PROTV_STORE) { /* ST/EX */
flags |= FAULT_FLAG_WRITE;
mask = VM_WRITE;
- } else if ((regs->ecr_vec == ECR_V_PROTV) &&
- (regs->ecr_cause == ECR_C_PROTV_INST_FETCH)) {
+ } else if ((regs->ecr_vec = ECR_V_PROTV) &&
+ (regs->ecr_cause = ECR_C_PROTV_INST_FETCH)) {
mask = VM_EXEC;
}
res = generic_fault(address, flags, mask, regs);
- if (likely(res == DONE))
+ if (likely(res = DONE))
return;
- if (res == FOAD)
+ if (res = FOAD)
return;
- if (res == KERN) {
+ if (res = KERN) {
no_context:
if (fixup_exception(regs))
return;
@@ -192,10 +192,10 @@ no_context:
}
tsk->thread.fault_address = address;
- if (res == SIGBUS)
+ if (res = SIGBUS)
force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *) address);
else
- force_sig_fault(SIGSEGV, res == ACCERR ? SEGV_ACCERR : SEGV_MAPERR,
+ force_sig_fault(SIGSEGV, res = ACCERR ? SEGV_ACCERR : SEGV_MAPERR,
(void __user *) address);
}
@@ -257,18 +257,18 @@ Or this arm64:
}
res = generic_fault(addr, mm_flags, vm_flags, regs);
- if (likely(res == DONE))
+ if (likely(res = DONE))
return 0;
- if (res == FOAD)
+ if (res = FOAD)
return 0;
- if (res == KERN) {
+ if (res = KERN) {
no_context:
__do_kernel_fault(addr, esr, regs);
return 0;
}
inf = esr_to_fault_info(esr);
set_thread_esr(addr, esr);
- if (res == SIGBUS) {
+ if (res = SIGBUS) {
/*
* We had some memory, but were unable to successfully fix up
* this page fault.
@@ -282,7 +282,7 @@ no_context:
* map.
*/
arm64_force_sig_fault(SIGSEGV,
- res == ACCERR ? SEGV_ACCERR : SEGV_MAPERR,
+ res = ACCERR ? SEGV_ACCERR : SEGV_MAPERR,
far, inf->name);
}
diff --git a/a/content_digest b/N2/content_digest
index ec633aa..ef346df 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -32,7 +32,7 @@
"Subject\0Re: [RFC][PATCHSET] VM_FAULT_RETRY fixes\0"
]
[
- "Date\0Sat, 4 Feb 2023 00:26:39 +0000\0"
+ "Date\0Sat, 04 Feb 2023 00:26:39 +0000\0"
]
[
"To\0Peter Xu <peterx\@redhat.com>\0"
@@ -160,7 +160,7 @@
"\t\treturn SIGBUS;\n",
"\n",
"\tif (fault & VM_FAULT_HWPOISON)\n",
- "\t\treturn POISON + PAGE_SHIFT;\t// POISON == 256\n",
+ "\t\treturn POISON + PAGE_SHIFT;\t// POISON = 256\n",
"\n",
"\tif (fault & VM_FAULT_HWPOISON_LARGE)\n",
"\t\treturn POISON + hstate_index_to_shift(VM_FAULT_GET_HINDEX(fault));\n",
@@ -234,17 +234,17 @@
"\tif (regs->ecr_cause & ECR_C_PROTV_STORE) {\t/* ST/EX */\n",
"\t\tflags |= FAULT_FLAG_WRITE;\n",
"\t\tmask = VM_WRITE;\n",
- "\t} else if ((regs->ecr_vec == ECR_V_PROTV) &&\n",
- "\t (regs->ecr_cause == ECR_C_PROTV_INST_FETCH)) {\n",
+ "\t} else if ((regs->ecr_vec = ECR_V_PROTV) &&\n",
+ "\t (regs->ecr_cause = ECR_C_PROTV_INST_FETCH)) {\n",
"\t\tmask = VM_EXEC;\n",
"\t}\n",
"\n",
"\tres = generic_fault(address, flags, mask, regs);\n",
- "\tif (likely(res == DONE))\n",
+ "\tif (likely(res = DONE))\n",
"\t\treturn;\n",
- "\tif (res == FOAD)\n",
+ "\tif (res = FOAD)\n",
"\t\treturn;\n",
- "\tif (res == KERN) {\n",
+ "\tif (res = KERN) {\n",
"no_context:\n",
"\t\tif (fixup_exception(regs))\n",
"\t\t\treturn;\n",
@@ -252,10 +252,10 @@
"\t}\n",
"\n",
"\ttsk->thread.fault_address = address;\n",
- "\tif (res == SIGBUS)\n",
+ "\tif (res = SIGBUS)\n",
"\t\tforce_sig_fault(SIGBUS, BUS_ADRERR, (void __user *) address);\n",
"\telse\n",
- "\t\tforce_sig_fault(SIGSEGV, res == ACCERR ? SEGV_ACCERR : SEGV_MAPERR,\n",
+ "\t\tforce_sig_fault(SIGSEGV, res = ACCERR ? SEGV_ACCERR : SEGV_MAPERR,\n",
"\t\t\t\t(void __user *) address);\n",
"}\n",
"\n",
@@ -317,18 +317,18 @@
"\t}\n",
"\n",
"\tres = generic_fault(addr, mm_flags, vm_flags, regs);\n",
- "\tif (likely(res == DONE))\n",
+ "\tif (likely(res = DONE))\n",
"\t\treturn 0;\n",
- "\tif (res == FOAD)\n",
+ "\tif (res = FOAD)\n",
"\t\treturn 0;\n",
- "\tif (res == KERN) {\n",
+ "\tif (res = KERN) {\n",
"no_context:\n",
"\t\t__do_kernel_fault(addr, esr, regs);\n",
"\t\treturn 0;\n",
"\t}\n",
"\tinf = esr_to_fault_info(esr);\n",
"\tset_thread_esr(addr, esr);\n",
- "\tif (res == SIGBUS) {\n",
+ "\tif (res = SIGBUS) {\n",
"\t\t/*\n",
"\t\t * We had some memory, but were unable to successfully fix up\n",
"\t\t * this page fault.\n",
@@ -342,7 +342,7 @@
"\t\t * map.\n",
"\t\t */\n",
"\t\tarm64_force_sig_fault(SIGSEGV,\n",
- "\t\t\t\t res == ACCERR ? SEGV_ACCERR : SEGV_MAPERR,\n",
+ "\t\t\t\t res = ACCERR ? SEGV_ACCERR : SEGV_MAPERR,\n",
"\t\t\t\t far, inf->name);\n",
"\t}\n",
"\n",
@@ -350,4 +350,4 @@
"}"
]
-b0f1048c41a0ad6b98983d58f1033448e411bfdb90240337c494944a8e1214ad
+ef166bec4e9052e93fdca933952b65257311c3ca795e21b36eec580f52caeb84
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.