SOURCES (LINUX_2_6_20): linux-2.6-vs2.3.patch - fix for arch/ia64/...

[mguevara]

Author: mguevara                     Date: Tue Jan 16 08:54:14 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6_20
---- Log message:
- fix for arch/ia64/kernel/traps.c

---- Files affected:
SOURCES:
   linux-2.6-vs2.3.patch (1.2.2.1 -> 1.2.2.2) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.2.1 SOURCES/linux-2.6-vs2.3.patch:1.2.2.2
--- SOURCES/linux-2.6-vs2.3.patch:1.2.2.1	Tue Jan 16 09:35:42 2007
+++ SOURCES/linux-2.6-vs2.3.patch	Tue Jan 16 09:54:08 2007
@@ -825,17 +825,17 @@
  		show_regs(regs);
    	} else
 @@ -331,8 +332,9 @@ handle_fpu_swa (int fp_fault, struct pt_
- 		last_time = jiffies;
- 		++fpu_swa_count;
- 		printk(KERN_WARNING
--		       "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
--		       current->comm, current->pid, regs->cr_iip + ia64_psr(regs)->ri, isr);
-+		       "%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n",
-+		       current->comm, current->pid, current->xid,
-+		       regs->cr_iip + ia64_psr(regs)->ri, isr);
+ 			if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) {
+ 				last.time = current_jiffies + 5 * HZ;
+ 				printk(KERN_WARNING
+-		       			"%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
+-		       			current->comm, current->pid, regs->cr_iip + ia64_psr(regs)->ri, isr);
++		       			"%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n",
++		       			current->comm, current->pid, current->xid,
++		       			regs->cr_iip + ia64_psr(regs)->ri, isr);
+ 			}
+ 		}
  	}
- 
- 	exception = fp_emulate(fp_fault, bundle, &regs->cr_ipsr, &regs->ar_fpsr, &isr, &regs->pr,
 diff -NurpP --minimal linux-2.6.19.1/arch/ia64/mm/fault.c linux-2.6.19.1-vs2.3.0.6/arch/ia64/mm/fault.c
 --- linux-2.6.19.1/arch/ia64/mm/fault.c	2006-11-30 21:18:27 +0100
 +++ linux-2.6.19.1-vs2.3.0.6/arch/ia64/mm/fault.c	2006-11-08 04:57:40 +0100
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.3.patch?r1=1.2.2.1&r2=1.2.2.2&f=u