couple 2.6.20 patches

diff --git a/queue-2.6.20/acpi-thermal-fix-mod_timer-interval.patch b/queue-2.6.20/acpi-thermal-fix-mod_timer-interval.patch
new file mode 100644 (file)
index 0000000..db3a9bc
--- /dev/null
+++ b/queue-2.6.20/acpi-thermal-fix-mod_timer-interval.patch
@@ -0,0 +1,34 @@
+From stable-bounces@linux.kernel.org  Wed May 23 15:44:49 2007
+Message-ID: <4654C38C.2010804@redhat.com>
+Date: Wed, 23 May 2007 18:43:24 -0400
+From: Chuck Ebbert <cebbert@redhat.com>
+To: stable@kernel.org
+Cc: "Brown, Len" <len.brown@intel.com>
+Subject: acpi-thermal: fix mod_timer() interval
+
+From:  Andrew Morton <akpm@linux-foundation.org>
+
+Use relative time, not absolute.  Discovered by Jung-Ik (John) Lee
+<jilee@google.com>.
+
+Cc: Jung-Ik (John) Lee <jilee@google.com>
+Acked-by: Len Brown <lenb@kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+ drivers/acpi/thermal.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- linux-2.6.20.11.orig/drivers/acpi/thermal.c
++++ linux-2.6.20.11/drivers/acpi/thermal.c
+@@ -758,7 +758,8 @@ static void acpi_thermal_check(void *dat
+                       del_timer(&(tz->timer));
+       } else {
+               if (timer_pending(&(tz->timer)))
+-                      mod_timer(&(tz->timer), (HZ * sleep_time) / 1000);
++                      mod_timer(&(tz->timer),
++                                      jiffies + (HZ * sleep_time) / 1000);
+               else {
+                       tz->timer.data = (unsigned long)tz;
+                       tz->timer.function = acpi_thermal_run;

diff --git a/queue-2.6.20/fuse-fix-mknod-of-regular-file.patch b/queue-2.6.20/fuse-fix-mknod-of-regular-file.patch
new file mode 100644 (file)
index 0000000..6e276ec
--- /dev/null
+++ b/queue-2.6.20/fuse-fix-mknod-of-regular-file.patch
@@ -0,0 +1,35 @@
+From stable-bounces@linux.kernel.org  Mon May 21 02:42:28 2007
+To: akpm@linux-foundation.org, stable@kernel.org
+Message-Id: <E1Hq4Mw-0002qK-00@dorka.pomaz.szeredi.hu>
+From: Miklos Szeredi <miklos@szeredi.hu>
+Date: Mon, 21 May 2007 11:39:58 +0200
+Cc: linux-kernel@vger.kernel.org
+Subject: fuse: fix mknod of regular file
+
+From: Miklos Szeredi <mszeredi@suse.cz>
+
+The wrong lookup flag was tested in ->create() causing havoc (error or
+Oops) when a regular file was created with mknod() in a fuse
+filesystem.
+
+Thanks to J. Cameijo Cerdeira for the report.
+
+Kernels 2.6.18 onward are affected.  Please apply to -stable as well.
+
+Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+ fs/fuse/dir.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.20.11.orig/fs/fuse/dir.c
++++ linux-2.6.20.11/fs/fuse/dir.c
+@@ -484,7 +484,7 @@ static int fuse_mknod(struct inode *dir,
+ static int fuse_create(struct inode *dir, struct dentry *entry, int mode,
+                      struct nameidata *nd)
+ {
+-      if (nd && (nd->flags & LOOKUP_CREATE)) {
++      if (nd && (nd->flags & LOOKUP_OPEN)) {
+               int err = fuse_create_open(dir, entry, mode, nd);
+               if (err != -ENOSYS)
+                       return err;

diff --git a/queue-2.6.20/series b/queue-2.6.20/series
index f2cbc81012ed1fa83cb5982c228974df57c283c6..7830fa31daba54f8e71d4984da5fcac095d124ad 100644 (file)
--- a/queue-2.6.20/series
+++ b/queue-2.6.20/series
@@ -8,4 +8,6 @@ sata_via-add-missing-pm-hooks.patch
 driver-core-don-t-free-devt_attr-till-the-device-is-released.patch
 jfs-fix-race-waking-up-jfsio-kernel-thread.patch
 crypto-api-read-module-pointer-before-freeing-algorithm.patch
+fuse-fix-mknod-of-regular-file.patch
+acpi-thermal-fix-mod_timer-interval.patch
 iop-fix-iop_getttimeoffset.patch