merge by hand - fix up rejections in Documentation/DocBook/Makefile

1 files changed, 6 insertions, 3 deletions

diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index da859125aaef..4174ec999dde 100644
--- a/arch/ia64/mm/fault.c
+++ b/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;