SOURCES (hawk-LINUX_2_6): linux-2.6-vs2.3.patch - merged fixes for...

[hawk]

Author: hawk                         Date: Mon Mar 26 16:24:47 2007 GMT
Module: SOURCES                       Tag: hawk-LINUX_2_6
---- Log message:
- merged fixes for fs/jffs2/ioctl.c and kernel/timer.c, killed empty failing
  chunk for arch/x86_64/kernel/irq.c

---- Files affected:
SOURCES:
   linux-2.6-vs2.3.patch (1.1.2.4 -> 1.1.2.5) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.1.2.4 SOURCES/linux-2.6-vs2.3.patch:1.1.2.5
--- SOURCES/linux-2.6-vs2.3.patch:1.1.2.4	Mon Mar 26 18:03:42 2007
+++ SOURCES/linux-2.6-vs2.3.patch	Mon Mar 26 18:24:41 2007
@@ -1970,17 +1970,6 @@
  	up_write(&mm->mmap_sem);
  	return 0;
  }
-diff -NurpP --minimal linux-2.6.20.1/arch/x86_64/kernel/irq.c linux-2.6.20.1-vs2.3.0.11/arch/x86_64/kernel/irq.c
---- linux-2.6.20.1/arch/x86_64/kernel/irq.c	2007-02-06 03:00:21 +0100
-+++ linux-2.6.20.1-vs2.3.0.11/arch/x86_64/kernel/irq.c	2007-02-06 03:05:21 +0100
-@@ -123,7 +123,6 @@ asmlinkage unsigned int do_IRQ(struct pt
- 	else if (printk_ratelimit())
- 		printk(KERN_EMERG "%s: %d.%d No irq handler for vector\n",
- 			__func__, smp_processor_id(), vector);
--
- 	irq_exit();
- 
- 	set_irq_regs(old_regs);
 diff -NurpP --minimal linux-2.6.20.1/arch/x86_64/kernel/process.c linux-2.6.20.1-vs2.3.0.11/arch/x86_64/kernel/process.c
 --- linux-2.6.20.1/arch/x86_64/kernel/process.c	2007-02-06 03:00:22 +0100
 +++ linux-2.6.20.1-vs2.3.0.11/arch/x86_64/kernel/process.c	2007-02-06 03:05:22 +0100
@@ -6621,10 +6610,11 @@
 diff -NurpP --minimal linux-2.6.20.1/fs/jffs2/ioctl.c linux-2.6.20.1-vs2.3.0.11/fs/jffs2/ioctl.c
 --- linux-2.6.20.1/fs/jffs2/ioctl.c	2006-01-03 17:29:56 +0100
 +++ linux-2.6.20.1-vs2.3.0.11/fs/jffs2/ioctl.c	2007-02-26 21:23:32 +0100
-@@ -12,12 +12,67 @@
+@@ -12,12 +12,68 @@
   */
  
  #include <linux/fs.h>
++#include <linux/sched.h>
 +#include <linux/types.h>
 +#include <linux/mount.h>
 +#include <linux/jffs2.h>
@@ -22076,9 +22066,9 @@
 --- linux-2.6.20.1/kernel/timer.c	2007-02-06 03:01:56 +0100
 +++ linux-2.6.20.1-vs2.3.0.11/kernel/timer.c	2007-02-06 03:05:22 +0100
 @@ -34,6 +34,10 @@
- #include <linux/cpu.h>
  #include <linux/syscalls.h>
  #include <linux/delay.h>
+ #include <linux/freezer.h>
 +#include <linux/vs_base.h>
 +#include <linux/vs_cvirt.h>
 +#include <linux/vs_pid.h>
================================================================

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