[kernel] r13260 - in dists/lenny/linux-2.6/debian: . patches/bugfix/mips patches/series

[Dann Frazier]

Author: dannf
Date: Thu Mar 26 15:55:40 2009
New Revision: 13260

Log:
* Switch out mips/llseek regression fix for the less invasive one
  that is more likely to be accepted upstream.

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/mips/fix-llseek-sign-extend-issue.patch
   dists/lenny/linux-2.6/debian/patches/series/15
Modified:
   dists/lenny/linux-2.6/debian/changelog

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	(original)
+++ dists/lenny/linux-2.6/debian/changelog	Thu Mar 26 15:55:40 2009
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.26-15) stable; urgency=high
+
+  * Switch out mips/llseek regression fix for the less invasive one
+    that is more likely to be accepted upstream.
+
+ -- dann frazier <dannf at debian.org>  Wed, 25 Mar 2009 16:48:44 -0600
+
 linux-2.6 (2.6.26-14) stable; urgency=high
 
   [ Moritz Muehlenhoff ]

Added: dists/lenny/linux-2.6/debian/patches/bugfix/mips/fix-llseek-sign-extend-issue.patch
==============================================================================
--- (empty file)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/mips/fix-llseek-sign-extend-issue.patch	Thu Mar 26 15:55:40 2009
@@ -0,0 +1,16 @@
+diff -urpN a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
+--- a/arch/mips/kernel/linux32.c	2009-03-25 17:04:58.000000000 -0600
++++ b/arch/mips/kernel/linux32.c	2009-03-25 17:04:24.000000000 -0600
+@@ -253,9 +253,9 @@ sys32_settimeofday(struct compat_timeval
+ 	return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL);
+ }
+ 
+-SYSCALL_DEFINE5(32_llseek, unsigned long, fd, unsigned long, offset_high,
+-	unsigned long, offset_low, loff_t __user *, result,
+-	unsigned long, origin)
++SYSCALL_DEFINE5(32_llseek, unsigned int, fd, unsigned int, offset_high,
++	unsigned int, offset_low, loff_t __user *, result,
++	unsigned int, origin)
+ {
+ 	return sys_llseek(fd, offset_high, offset_low, result, origin);
+ }

Added: dists/lenny/linux-2.6/debian/patches/series/15
==============================================================================
--- (empty file)
+++ dists/lenny/linux-2.6/debian/patches/series/15	Thu Mar 26 15:55:40 2009
@@ -0,0 +1,2 @@
+- bugfix/all/fix-llseek-sign-extend-issue.patch
++ bugfix/mips/fix-llseek-sign-extend-issue.patch