---

yaml
---
r: 519
b: refs/heads/master
c: f0a8d3c
h: refs/heads/master
i:
  517: d76938b
  515: 0bd4faf
  511: a4ccb14
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0985ea8f2db87d32b0b750229889e55fed7458ef
+refs/heads/master: f0a8d3c9ec1f82d2a41faa6c46b8db7bd5b1eb8d

trunk/arch/ia64/mm/fault.c

@@ -209,10 +209,13 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
 	}
 
   no_context:
-	if (isr & IA64_ISR_SP) {
+	if ((isr & IA64_ISR_SP)
+	    || ((isr & IA64_ISR_NA) && (isr & IA64_ISR_CODE_MASK) == IA64_ISR_CODE_LFETCH))
+	{
 		/*
-		 * This fault was due to a speculative load set the "ed" bit in the psr to
-		 * ensure forward progress (target register will get a NaT).
+		 * This fault was due to a speculative load or lfetch.fault, set the "ed"
+		 * bit in the psr to ensure forward progress.  (Target register will get a
+		 * NaT for ld.s, lfetch will be canceled.)
 		 */
 		ia64_psr(regs)->ed = 1;
 		return;