r3665 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: .
patches patches/series
Dann Frazier
dannf at costa.debian.org
Tue Aug 2 04:31:45 UTC 2005
Author: dannf
Date: 2005-08-02 04:31:44 +0000 (Tue, 02 Aug 2005)
New Revision: 3665
Added:
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/ppc32-time_offset-misuse.dpatch
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/tty_ldisc_ref-return-null-check.dpatch
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/v4l-cx88-hue-offset-fix.dpatch
Modified:
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17
Log:
* Merge in applicable fixes from 2.6.12.3
- ppc32-time_offset-misuse.dpatch
- v4l-cx88-hue-offset-fix.dpatch
- tty_ldisc_ref-return-null-check.dpatch
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog 2005-08-02 02:52:35 UTC (rev 3664)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog 2005-08-02 04:31:44 UTC (rev 3665)
@@ -1,5 +1,6 @@
kernel-source-2.6.8 (2.6.8-17) UNRELEASED; urgency=low
+ [ Simon Horman ]
* mckinley_icache.dpatch:
Fix a cache coherency bug unearthed by a new ia64 processor, codenamed
Montecito. This bug causes data corruption that has manifested itself
@@ -159,8 +160,14 @@
there is some value in being able to use it with unstable.
(Simon Horman)
- -- Simon Horman <horms at debian.org> Mon, 1 Aug 2005 09:52:08 +0900
+ [ dann frazier ]
+ * Merge in applicable fixes from 2.6.12.3
+ - ppc32-time_offset-misuse.dpatch
+ - v4l-cx88-hue-offset-fix.dpatch
+ - tty_ldisc_ref-return-null-check.dpatch
+ -- dann frazier <dannf at debian.org> Mon, 1 Aug 2005 22:28:59 -0600
+
kernel-source-2.6.8 (2.6.8-16) unstable; urgency=low
* smbfs-overrun.dpatch:
Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/ppc32-time_offset-misuse.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/ppc32-time_offset-misuse.dpatch 2005-08-02 02:52:35 UTC (rev 3664)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/ppc32-time_offset-misuse.dpatch 2005-08-02 04:31:44 UTC (rev 3665)
@@ -0,0 +1,80 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR at EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: ppc32: stop misusing ntps time_offset value
+## DP: Patch author: john stultz <johnstul at us.ibm.com>
+## DP: Upstream status: upstream
+
+. $(dirname $0)/DPATCH
+
+ at DPATCH@
+From: john stultz <johnstul at us.ibm.com>
+Date: Fri, 1 Jul 2005 05:08:54 +0000 (+1000)
+Subject: [PATCH] ppc32: stop misusing ntps time_offset value
+X-Git-Tag: v2.6.12.3
+X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/gregkh/linux-2.6.12.y.git;a=commitdiff;h=8f399a7448e0b58eae969426f61b7e81d55d2639
+
+ [PATCH] ppc32: stop misusing ntps time_offset value
+
+ As part of my timeofday rework, I've been looking at the NTP code and I
+ noticed that the PPC architecture is apparently misusing the NTP's
+ time_offset (it is a terrible name!) value as some form of timezone offset.
+
+ This could cause problems when time_offset changed by the NTP code. This
+ patch changes the PPC code so it uses a more clear local variable:
+ timezone_offset.
+
+ Signed-off-by: John Stultz <johnstul at us.ibm.com>
+ Acked-by: Tom Rini <trini at kernel.crashing.org>
+ Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+ Signed-off-by: Andrew Morton <akpm at osdl.org>
+ Signed-off-by: Chris Wright <chrisw at osdl.org>
+ Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+Backported to Debian's 2.6.8 by dann frazier <dannf at debian.org>
+
+diff -urN kernel-source-2.6.8.orig/arch/ppc/kernel/time.c kernel-source-2.6.8/arch/ppc/kernel/time.c
+--- kernel-source-2.6.8.orig/arch/ppc/kernel/time.c 2004-08-13 23:37:38.000000000 -0600
++++ kernel-source-2.6.8/arch/ppc/kernel/time.c 2005-08-01 21:55:05.604807742 -0600
+@@ -89,7 +89,7 @@
+
+ extern unsigned long wall_jiffies;
+
+-static long time_offset;
++static long timezone_offset;
+
+ spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED;
+
+@@ -194,7 +194,7 @@
+ xtime.tv_sec - last_rtc_update >= 659 &&
+ abs((xtime.tv_nsec / 1000) - (1000000-1000000/HZ)) < 500000/HZ &&
+ jiffies - wall_jiffies == 1) {
+- if (ppc_md.set_rtc_time(xtime.tv_sec+1 + time_offset) == 0)
++ if (ppc_md.set_rtc_time(xtime.tv_sec+1 + timezone_offset) == 0)
+ last_rtc_update = xtime.tv_sec+1;
+ else
+ /* Try again one minute later */
+@@ -315,7 +315,7 @@
+ unsigned old_stamp, stamp, elapsed;
+
+ if (ppc_md.time_init != NULL)
+- time_offset = ppc_md.time_init();
++ timezone_offset = ppc_md.time_init();
+
+ if (__USE_RTC()) {
+ /* 601 processor: dec counts down by 128 every 128ns */
+@@ -360,10 +360,10 @@
+ set_dec(tb_ticks_per_jiffy);
+
+ /* If platform provided a timezone (pmac), we correct the time */
+- if (time_offset) {
+- sys_tz.tz_minuteswest = -time_offset / 60;
++ if (timezone_offset) {
++ sys_tz.tz_minuteswest = -timezone_offset / 60;
+ sys_tz.tz_dsttime = 0;
+- xtime.tv_sec -= time_offset;
++ xtime.tv_sec -= timezone_offset;
+ }
+ set_normalized_timespec(&wall_to_monotonic,
+ -xtime.tv_sec, -xtime.tv_nsec);
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17 2005-08-02 02:52:35 UTC (rev 3664)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17 2005-08-02 04:31:44 UTC (rev 3665)
@@ -31,3 +31,6 @@
+ arch-ia64-ptrace-getregs-putregs.dpatch
+ arch-ia64-ptrace-restore_sigcontext.dpatch
+ Makefile-gcc-3.3.dpatch
++ ppc32-time_offset-misuse.dpatch
++ v4l-cx88-hue-offset-fix.dpatch
++ tty_ldisc_ref-return-null-check.dpatch
Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/tty_ldisc_ref-return-null-check.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/tty_ldisc_ref-return-null-check.dpatch 2005-08-02 02:52:35 UTC (rev 3664)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/tty_ldisc_ref-return-null-check.dpatch 2005-08-02 04:31:44 UTC (rev 3665)
@@ -0,0 +1,59 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR at EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: coverity: tty_ldisc_ref return null check
+## DP: Patch author: KAMBAROV, ZAUR <kambarov at berkeley.edu>
+## DP: Upstream status: upstream
+
+. $(dirname $0)/DPATCH
+
+ at DPATCH@
+From: KAMBAROV, ZAUR <kambarov at berkeley.edu>
+Date: Thu, 30 Jun 2005 01:12:05 +0000 (-0700)
+Subject: [PATCH] coverity: tty_ldisc_ref return null check
+X-Git-Tag: v2.6.12.3
+X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/gregkh/linux-2.6.12.y.git;a=commitdiff;h=19a51b0ee71ee00497619f441c59b4acd44cf1e5
+
+ [PATCH] coverity: tty_ldisc_ref return null check
+
+ We add a check of the return value of tty_ldisc_ref(), which
+ is checked 7 out of 8 times, e.g.:
+
+ 149 ld = tty_ldisc_ref(tty);
+ 150 if (ld != NULL) {
+ 151 if (ld->set_termios)
+ 152 (ld->set_termios)(tty, &old_termios);
+ 153 tty_ldisc_deref(ld);
+ 154 }
+
+ This defect was found automatically by Coverity Prevent, a static analysis
+ tool.
+
+ (akpm: presumably `ld' is never NULL. Oh well)
+
+ Signed-off-by: Zaur Kambarov <zkambarov at coverity.com>
+ Acked-by: Alan Cox <alan at lxorguk.ukuu.org.uk>
+ Signed-off-by: Andrew Morton <akpm at osdl.org>
+ Signed-off-by: Chris Wright <chrisw at osdl.org>
+ Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+
+Backported to Debian's kernel-source-2.6.8 by dann frazier <dannf at debian.org>
+
+--- a/drivers/char/tty_ioctl.c
++++ b/drivers/char/tty_ioctl.c
+@@ -476,11 +476,11 @@ int n_tty_ioctl(struct tty_struct * tty,
+ ld = tty_ldisc_ref(tty);
+ switch (arg) {
+ case TCIFLUSH:
+- if (ld->flush_buffer)
++ if (ld && ld->flush_buffer)
+ ld->flush_buffer(tty);
+ break;
+ case TCIOFLUSH:
+- if (ld->flush_buffer)
++ if (ld && ld->flush_buffer)
+ ld->flush_buffer(tty);
+ /* fall through */
+ case TCOFLUSH:
Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/v4l-cx88-hue-offset-fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/v4l-cx88-hue-offset-fix.dpatch 2005-08-02 02:52:35 UTC (rev 3664)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/v4l-cx88-hue-offset-fix.dpatch 2005-08-02 04:31:44 UTC (rev 3665)
@@ -0,0 +1,42 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR at EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: v4l cx88 hue offset fix
+## DP: Patch author: Michael Krufky <mkrufky at m1k.net>
+## DP: Upstream status: upstream
+
+. $(dirname $0)/DPATCH
+
+ at DPATCH@
+From: Michael Krufky <mkrufky at m1k.net>
+Date: Thu, 30 Jun 2005 20:06:41 +0000 (-0400)
+Subject: [PATCH] v4l cx88 hue offset fix
+X-Git-Tag: v2.6.12.3
+X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/gregkh/linux-2.6.12.y.git;a=commitdiff;h=aebaaf4060dd0db163694da8e4ab7ba86add57b9
+
+ [PATCH] v4l cx88 hue offset fix
+
+ Changed hue offset to 128 to correct behavior in cx88 cards. Previously,
+ setting 0% or 100% hue was required to avoid blue/green people on screen.
+ Now, 50% Hue means no offset, just like bt878 stuff.
+
+ Signed-off-by: Michael Krufky <mkrufky at m1k.net>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab at brturbo.com.br>
+ Signed-off-by: Chris Wright <chrisw at osdl.org>
+ Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+
+Backported to Debian's kernel-source-2.6.8 by dann frazier <dannf at debian.org>
+
+--- a/drivers/media/video/cx88/cx88-video.c
++++ b/drivers/media/video/cx88/cx88-video.c
+@@ -261,7 +261,7 @@ static struct cx88_ctrl cx8800_ctls[] =
+ .default_value = 0,
+ .type = V4L2_CTRL_TYPE_INTEGER,
+ },
+- .off = 0,
++ .off = 128,
+ .reg = MO_HUE,
+ .mask = 0x00ff,
+ .shift = 0,
More information about the Kernel-svn-changes
mailing list