[kernel] r5614 - in dists/sid/linux-2.6/debian: . patches patches/series

[Frederik Schüler]

Author: fs
Date: Sat Jan 28 12:38:52 2006
New Revision: 5614

Added:
   dists/sid/linux-2.6/debian/patches/64bit-vidiocswin-ioctl-fix.patch
   dists/sid/linux-2.6/debian/patches/amd64-pppd-fix.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/4
Log:
Add amd64-pppd-fix.patch to fix kernel panic when using pppd.
Add 64bit-vidiocswin-ioctl-fix.patch to fix VIDIOCSWIN ioctl on 64bit kernel 32bit userland setups.



Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sat Jan 28 12:38:52 2006
@@ -19,7 +19,7 @@
 
   [ Steve Langasek ]
   * [alpha] set __attribute__((always_inline)) on __cmpxchg(), to avoid
-    wrong optimizations with -Os (closes: #347556).
+    wrong optimizations with -Os (Closes: #347556).
 
   [ Martin Michlmayr ]
   * Add input support for the ixp4xx beeper driver (Alessandro Zummo).
@@ -29,7 +29,13 @@
   * [arm/nslu2] Enable most USB modules.
   * [arm/nslu2] Enable ALSA and USB sound modules.
 
- -- Steve Langasek <vorlon at debian.org>  Fri, 27 Jan 2006 13:25:34 -0800
+  [ Frederik Schüler ]
+  * [amd64] Add amd64-pppd-fix.patch to fix kernel panic when using pppd.
+    (Closes: #347711)
+  * Add 64bit-vidiocswin-ioctl-fix.patch to fix VIDIOCSWIN ioctl on 64bit
+    kernel 32bit userland setups. (Closes: #349338)
+
+ -- Frederik Schüler <fs at debian.org>  Sat, 28 Jan 2006 13:28:10 +0100
 
 linux-2.6 (2.6.15-3) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/64bit-vidiocswin-ioctl-fix.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/64bit-vidiocswin-ioctl-fix.patch	Sat Jan 28 12:38:52 2006
@@ -0,0 +1,12 @@
+--- a/fs/compat_ioctl.c.old	2005-12-19 08:10:17.000000000 +0100
++++ b/fs/compat_ioctl.c	2005-12-19 09:13:14.000000000 +0100
+@@ -343,7 +343,7 @@
+ 		}
+ 	}
+ 
+-	return sys_ioctl(fd, VIDIOCSWIN, (unsigned long)p);
++	return sys_ioctl(fd, VIDIOCSWIN, (unsigned long)vw);
+ }
+ 
+ static int do_video_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
+

Added: dists/sid/linux-2.6/debian/patches/amd64-pppd-fix.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/amd64-pppd-fix.patch	Sat Jan 28 12:38:52 2006
@@ -0,0 +1,23 @@
+diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
+index e5fd66c..ad7cc22 100644
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -926,7 +926,7 @@ static inline int skb_tailroom(const str
+  *	Increase the headroom of an empty &sk_buff by reducing the tail
+  *	room. This is only allowed for an empty buffer.
+  */
+-static inline void skb_reserve(struct sk_buff *skb, unsigned int len)
++static inline void skb_reserve(struct sk_buff *skb, int len)
+ {
+ 	skb->data += len;
+ 	skb->tail += len;
+-
+To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+-
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at  http://www.tux.org/lkml/
+

Modified: dists/sid/linux-2.6/debian/patches/series/4
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/4	(original)
+++ dists/sid/linux-2.6/debian/patches/series/4	Sat Jan 28 12:38:52 2006
@@ -3,3 +3,5 @@
 + alpha-cmpxchg-inline.patch
 + input-ixp4xx-beeper.patch
 + arm-nslu2-beeper.patch
++ amd64-pppd-fix.patch
++ 64bit-vidiocswin-ioctl-fix.patch