Linux 2.6.17.7
Subsystems (20)
We (the -stable team) are announcing the release of the 2.6.17.7 kernel.
I'll also be replying to this message with a copy of the patch between 2.6.17.6 and 2.6.17.7, as it is small enough to do so.
The updated 2.6.17.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.17.y.git
and can be browsed at the normal kernel.org git web browser:
www.kernel.org/git/
thanks,
greg k-h
--------
Makefile | 2 arch/i386/Kconfig | 3 arch/i386/kernel/cpu/cpufreq/powernow-k7.c | 5 arch/i386/kernel/cpu/cpufreq/powernow-k8.c | 2 arch/ia64/Kconfig | 3 arch/powerpc/Kconfig | 3 arch/x86_64/Kconfig | 2 arch/x86_64/kernel/setup.c | 2 block/ll_rw_blk.c | 2 drivers/acpi/namespace/nsxfeval.c | 5 drivers/cdrom/cdrom.c | 2 drivers/infiniband/hw/mthca/mthca_reset.c | 59 +++++++ drivers/media/dvb/bt8xx/dvb-bt8xx.c | 10 + drivers/media/dvb/bt8xx/dvb-bt8xx.h | 1 drivers/media/dvb/dvb-core/dvb_frontend.c | 14 + drivers/media/dvb/frontends/dvb-pll.c | 10 - drivers/media/dvb/ttpci/budget-av.c | 20 +- drivers/media/dvb/ttpci/budget.c | 6 drivers/media/video/Kconfig | 6 drivers/media/video/stradis.c | 1 drivers/net/via-velocity.c | 6 drivers/pnp/resource.c | 3 drivers/serial/8250.c | 13 + drivers/usb/serial/ftdi_sio.c | 84 ++++++++-- fs/file.c | 4 fs/namei.c | 8 - fs/splice.c | 230 ++++++++++++++++------------- fs/xfs/xfs_dir2_node.c | 2 include/sound/initval.h | 3 mm/Kconfig | 2 mm/filemap.c | 27 ++- mm/filemap.h | 4 mm/pdflush.c | 15 - net/core/dev.c | 1 net/core/ethtool.c | 2 net/core/skbuff.c | 2 net/decnet/dn_rules.c | 3 net/ieee80211/Kconfig | 1 net/ipv4/fib_rules.c | 4 net/sched/act_api.c | 18 +- sound/core/timer.c | 5 sound/isa/cs423x/Makefile | 1 sound/pci/Kconfig | 14 + sound/pci/au88x0/au88x0_mpu401.c | 2 sound/pci/fm801.c | 2 sound/pci/hda/hda_intel.c | 4 sound/pci/hda/patch_analog.c | 19 +- sound/pci/hda/patch_realtek.c | 2 sound/pci/hda/patch_sigmatel.c | 8 - sound/pci/rme9652/hdsp.c | 5 50 files changed, 434 insertions(+), 218 deletions(-)
Summary of changes from v2.6.17.6 to v2.6.17.7
==============================================
Andi Kleen:
BLOCK: Fix bounce limit address check
Andrew de Quincey:
v4l/dvb: Fix budget-av frontend detection v4l/dvb: Fix CI on old KNC1 DVBC cards v4l/dvb: Fix CI interface on PRO KNC1 cards v4l/dvb: Backport fix to artec USB DVB devices v4l/dvb: Backport the DISEQC regression fix to 2.6.17.x v4l/dvb: stradis: dont export MODULE_DEVICE_TABLE
Andrew Morton:
pnp: suppress request_irq() warning generic_file_buffered_write(): handle zero-length iovec segments serial 8250: sysrq deadlock fix
Bob Moore:
Reduce ACPI verbosity on null handle condition
Chuck Ebbert:
ieee80211: TKIP requires CRC32
Dave Jones:
Make powernow-k7 work on SMP kernels.
Francois Romieu:
via-velocity: the link is not correctly detected when the device starts
Greg Kroah-Hartman:
Linux 2.6.17.7
Herbert Xu:
Add missing UFO initialisations
Ian Abbott:
USB serial ftdi_sio: Prevent userspace DoS (CVE-2006-2936)
Jens Axboe:
cdrom: fix bad cgc.buflen assignment
splice: fix problems with sys_tee()
Kirill Korotaev:
fix fdset leakage
struct file leakage
Mandy Kirkconnell:
XFS: corruption fix
Michael Krufky:
v4l/dvb: Kconfig: fix description and dependencies for saa7115 module
dvb-bt8xx: fix frontend detection for DViCO FusionHDTV DVB-T Lite rev 1.2
Michael S. Tsirkin:
IB/mthca: restore missing PCI registers after reset
Oliver Endriss:
v4l/dvb: Backport the budget driver DISEQC instability fix
Patrick McHardy:
Fix IPv4/DECnet routing rule dumping
Pavel Machek:
pdflush: handle resume wakeups
Piotr Kaczuba:
x86_64: Fix modular pc speaker
Randy Dunlap:
Fix powernow-k8 SMP kernel on UP hardware bug.
Remy Bruno:
ALSA: RME HDSP - fixed proc interface (missing {})
Takashi Iwai:
ALSA: au88x0 - Fix 64bit address of MPU401 MMIO port
ALSA: Fix a deadlock in snd-rtctimer
ALSA: Fix missing array terminators in AD1988 codec support
ALSA: Fix model for HP dc7600
ALSA: Fix mute switch on VAIO laptops with STAC7661
ALSA: fix the SND_FM801_TEA575X dependencies
ALSA: Fix undefined (missing) references in ISA MIRO sound driver
ALSA: Fix workaround for AD1988A rev2 codec
ALSA: hda-intel - Fix race in remove
Suppress irq handler mismatch messages in ALSA ISA drivers
Thomas Graf:
PKT_SCHED: Fix illegal memory dereferences when dumping actions
PKT_SCHED: Return ENOENT if action module is unavailable
PKT_SCHED: Fix error handling while dumping actions
Vladimir V. Saveliev:
generic_file_buffered_write(): deadlock on vectored write
Willy Tarreau:
ethtool: oops in ethtool_set_pauseparam()
Yasunori Goto:
memory hotplug: solve config broken: undefined reference to `online_page'
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 17 -EXTRAVERSION = .6 +EXTRAVERSION = .7 NAME=Crazed Snow-Weasel # *DOCUMENTATION*
arch/i386/Kconfig +3 -0
@@ -765,6 +765,9 @@ config HOTPLUG_CPU endmenu +config ARCH_ENABLE_MEMORY_HOTPLUG + def_bool y + depends on HIGHMEM menu "Power management options (ACPI, APM)" depends on !X86_VOYAGER
arch/i386/kernel/cpu/cpufreq/powernow-k7.c +1 -4
@@ -581,10 +581,7 @@ static int __init powernow_cpu_init (strrdmsrl (MSR_K7_FID_VID_STATUS , fidvidstatus.val); -/* recalibrate cpu_khz */ - result =recalibrate_cpu_khz (); -if (result) -return result; +recalibrate_cpu_khz (); fsb = (10 * cpu_khz) / fid_codes[fidvidstatus.bits.CFID];if (!fsb) {
arch/i386/kernel/cpu/cpufreq/powernow-k8.c +1 -1
@@ -1008,7 +1008,7 @@ static int __cpuinit powernowk8_cpu_init* an UP version, and is deprecated by AMD. */ -if ((num_online_cpus () !=1 ) || (num_possible_cpus () !=1 )) { +if (num_online_cpus () !=1 ) { printk(KERN_ERR PFX "MP systems not supported by PSB BIOS structure\n");kfree (data);return -ENODEV ;
arch/ia64/Kconfig +3 -0
@@ -270,6 +270,9 @@ config HOTPLUG_CPU can be controlled through /sys/devices/system/cpu/cpu#. Say N if you want to disable CPU hotplug. +config ARCH_ENABLE_MEMORY_HOTPLUG + def_bool y + config SCHED_SMT bool "SMT scheduler support" depends on SMP
arch/powerpc/Kconfig +3 -0
@@ -599,6 +599,9 @@ config HOTPLUG_CPU Say N if you are unsure. +config ARCH_ENABLE_MEMORY_HOTPLUG + def_bool y + config KEXEC bool "kexec system call (EXPERIMENTAL)" depends on PPC_MULTIPLATFORM && EXPERIMENTAL
arch/x86_64/Kconfig +2 -0
@@ -369,6 +369,8 @@ config HOTPLUG_CPU can be controlled through /sys/devices/system/cpu/cpu#. Say N if you want to disable CPU hotplug. +config ARCH_ENABLE_MEMORY_HOTPLUG + def_bool y config HPET_TIMER bool
arch/x86_64/kernel/setup.c +1 -1
@@ -1440,7 +1440,7 @@ struct seq_operations cpuinfo_op = { .show = show_cpuinfo, }; -#ifdef CONFIG_INPUT_PCSPKR +#if defined(CONFIG_INPUT_PCSPKR ) || defined(CONFIG_INPUT_PCSPKR_MODULE )#include <linux/platform_device.h> static __init int add_pcspkr (void ) {
block/ll_rw_blk.c +1 -1
@@ -638,7 +638,7 @@ #if BITS_PER_LONG == 64/* Assume anything <= 4GB can be handled by IOMMU. Actually some IOMMUs can handle everything, but I don't know of a way to test this here. */ -if (bounce_pfn < (0xffffffff >>PAGE_SHIFT )) +if (bounce_pfn < (min_t (u64,0xffffffff ,BLK_BOUNCE_HIGH ) >>PAGE_SHIFT )) dma =1 ; q->bounce_pfn = max_low_pfn;#else
drivers/acpi/namespace/nsxfeval.c +3 -2
@@ -238,8 +238,9 @@ acpi_evaluate_object(acpi_handle handle,ACPI_ERROR ((AE_INFO ,"Both Handle and Pathname are NULL" )); }else { -ACPI_ERROR ((AE_INFO , -"Handle is NULL and Pathname is relative" )); +ACPI_DEBUG_PRINT ((ACPI_DB_INFO , +"Null Handle with relative pathname [%s]" , + pathname)); } status =AE_BAD_PARAMETER ;
drivers/cdrom/cdrom.c +1 -1
@@ -1838,7 +1838,7 @@ static int dvd_read_bca(struct cdrom_devinit_cdrom_command (&cgc, buf,sizeof (buf),CGC_DATA_READ ); cgc.cmd[0 ] =GPCMD_READ_DVD_STRUCTURE ; cgc.cmd[7 ] = s->type; - cgc.cmd[9 ] = cgc.buflen =0xff ; + cgc.cmd[9 ] = cgc.buflen &0xff ;if ((ret = cdo->generic_packet (cdi, &cgc)))return ret;
drivers/infiniband/hw/mthca/mthca_reset.c +59 -0
89 lines not on this page · raw message
drivers/media/dvb/bt8xx/dvb-bt8xx.c +10 -0
@@ -184,6 +184,11 @@ static struct mt352_config thomson_dtt75 .pll_set = thomson_dtt7579_pll_set, }; +static struct zl10353_config thomson_dtt7579_zl10353_config = { + .demod_address =0x0f , + .pll_set = thomson_dtt7579_pll_set, +}; +static int cx24108_pll_set (struct dvb_frontend * fe,struct dvb_frontend_parameters * params) {u32 freq = params->frequency;
@@ -617,6 +622,11 @@ static void frontend_init(struct dvb_bt8switch (type) {case BTTV_BOARD_DVICO_DVBT_LITE : card->fe =mt352_attach (&thomson_dtt7579_config, card->i2c_adapter); + +if (card->fe ==NULL ) + card->fe =zl10353_attach (&thomson_dtt7579_zl10353_config, + card->i2c_adapter); +if (card->fe !=NULL ) { card->fe->ops->info.frequency_min =174000000 ; card->fe->ops->info.frequency_max =862000000 ;
drivers/media/dvb/bt8xx/dvb-bt8xx.h +1 -0
@@ -37,6 +37,7 @@ #include "nxt6000.h"#include "cx24110.h" #include "or51211.h" #include "lgdt330x.h" +#include "zl10353.h" struct dvb_bt8xx_card {struct mutex lock;
drivers/media/dvb/dvb-core/dvb_frontend.c +8 -6
@@ -519,7 +519,9 @@ static int dvb_frontend_thread(void *dat fepriv->delay =3 *HZ ; fepriv->status =0 ; fepriv->wakeup =0 ; - fepriv->reinitialise =1 ; + fepriv->reinitialise =0 ; + +dvb_frontend_init (fe);while (1 ) {up (&fepriv->sem);/* is locked when we enter the thread... */
@@ -996,17 +998,17 @@ static int dvb_frontend_open(struct inodreturn ret;if ((file->f_flags &O_ACCMODE ) !=O_RDONLY ) { +/* normal tune mode when opened R/W */ + fepriv->tune_mode_flags &= ~FE_TUNE_MODE_ONESHOT ; + fepriv->tone =-1 ; + fepriv->voltage =-1 ; + ret =dvb_frontend_start (fe);if (ret)dvb_generic_release (inode, file);/* empty event queue */ fepriv->events.eventr = fepriv->events.eventw =0 ; - -/* normal tune mode when opened R/W */ - fepriv->tune_mode_flags &= ~FE_TUNE_MODE_ONESHOT ; - fepriv->tone =-1 ; - fepriv->voltage =-1 ; }return ret;
drivers/media/dvb/frontends/dvb-pll.c +5 -5
@@ -194,11 +194,11 @@ struct dvb_pll_desc dvb_pll_tda665x = { { 253834000, 36249333, 166667, 0xca, 0x62 /* 011 0 0 0 10 */ }, { 383834000, 36249333, 166667, 0xca, 0xa2 /* 101 0 0 0 10 */ }, { 443834000, 36249333, 166667, 0xca, 0xc2 /* 110 0 0 0 10 */ }, - { 444000000, 36249333, 166667, 0xca, 0xc3 /* 110 0 0 0 11 */ }, - { 583834000, 36249333, 166667, 0xca, 0x63 /* 011 0 0 0 11 */ }, - { 793834000, 36249333, 166667, 0xca, 0xa3 /* 101 0 0 0 11 */ }, - { 444834000, 36249333, 166667, 0xca, 0xc3 /* 110 0 0 0 11 */ }, - { 861000000, 36249333, 166667, 0xca, 0xe3 /* 111 0 0 0 11 */ }, + { 444000000, 36249333, 166667, 0xca, 0xc4 /* 110 0 0 1 00 */ }, + { 583834000, 36249333, 166667, 0xca, 0x64 /* 011 0 0 1 00 */ }, + { 793834000, 36249333, 166667, 0xca, 0xa4 /* 101 0 0 1 00 */ }, + { 444834000, 36249333, 166667, 0xca, 0xc4 /* 110 0 0 1 00 */ }, + { 861000000, 36249333, 166667, 0xca, 0xe4 /* 111 0 0 1 00 */ }, } };EXPORT_SYMBOL (dvb_pll_tda665x);
drivers/media/dvb/ttpci/budget-av.c +13 -7
@@ -1017,12 +1017,13 @@ static void frontend_init(struct budget_struct saa7146_dev * saa = budget_av->budget.dev;struct dvb_frontend * fe =NULL ; +/* Enable / PowerON Frontend */ +saa7146_setgpio (saa,0 ,SAA7146_GPIO_OUTLO ); +switch (saa->pci->subsystem_device) {case SUBID_DVBS_KNC1_PLUS :case SUBID_DVBC_KNC1_PLUS :case SUBID_DVBT_KNC1_PLUS : -// Enable / PowerON Frontend -saa7146_setgpio (saa,0 ,SAA7146_GPIO_OUTLO );saa7146_setgpio (saa,3 ,SAA7146_GPIO_OUTHI );break ; }
@@ -1059,6 +1060,15 @@ static void frontend_init(struct budget_break ;case SUBID_DVBC_KNC1 : + budget_av->reinitialise_demod =1 ; + fe =tda10021_attach (&philips_cu1216_config, + &budget_av->budget.i2c_adap, +read_pwm (budget_av)); +if (fe) { + fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set_params; + } +break ; +case SUBID_DVBC_KNC1_PLUS : fe = tda10021_attach(&philips_cu1216_config, &budget_av->budget.i2c_adap,
@@ -1208,11 +1218,7 @@ static int budget_av_attach(struct saa71 budget_av->budget.dvb_adapter.priv = budget_av;frontend_init (budget_av); - -if (!budget_av->has_saa7113) { -ciintf_init (budget_av); - } - +ciintf_init (budget_av);return 0 ; }
drivers/media/dvb/ttpci/budget.c +0 -6
@@ -367,12 +367,6 @@ static void frontend_init(struct budget// try the ALPS BSRU6 now budget->dvb_frontend =stv0299_attach (&alps_bsru6_config, &budget->i2c_adap); -if (budget->dvb_frontend) { - budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_diseqc_send_master_cmd; - budget->dvb_frontend->ops->diseqc_send_burst = budget_diseqc_send_burst; - budget->dvb_frontend->ops->set_tone = budget_set_tone; -break ; - }break ;case 0x1004 :// Hauppauge/TT DVB-C budget (ves1820/ALPS TDBE2(sp5659))
drivers/media/video/Kconfig +3 -3
@@ -380,10 +380,10 @@ config VIDEO_WM8739 source "drivers/media/video/cx25840/Kconfig" config VIDEO_SAA711X - tristate "Philips SAA7113/4/5 video decoders (OBSOLETED)" - depends on VIDEO_V4L1 && I2C && EXPERIMENTAL + tristate "Philips SAA7113/4/5 video decoders" + depends on VIDEO_DEV && I2C && EXPERIMENTAL ---help--- - Old support for the Philips SAA7113/4 video decoders. + Support for the Philips SAA7113/4/5 video decoders. To compile this driver as a module, choose M here: the module will be called saa7115.
drivers/media/video/stradis.c +0 -1
@@ -2180,7 +2180,6 @@ static struct pci_device_id stradis_pci_ { 0 } }; -MODULE_DEVICE_TABLE (pci, stradis_pci_tbl);static struct pci_driver stradis_driver = { .name ="stradis" ,
drivers/net/via-velocity.c +6 -0
@@ -248,6 +248,7 @@ static void velocity_free_rd_ring(structstatic void velocity_free_tx_buf (struct velocity_info *vptr,struct velocity_td_info *);static int velocity_soft_reset (struct velocity_info *vptr);static void mii_init (struct velocity_info *vptr,u32 mii_status); +static u32 velocity_get_link (struct net_device *dev);static u32 velocity_get_opt_media_mode (struct velocity_info *vptr);static void velocity_print_link_status (struct velocity_info *vptr);static void safe_disable_mii_autopoll (struct mac_regs __iomem * regs);
@@ -798,6 +799,9 @@ #endifif (ret <0 ) goto err_iounmap; +if (velocity_get_link (dev)) +netif_carrier_off (dev); +velocity_print_info (vptr);pci_set_drvdata (pdev, dev);
@@ -1653,8 +1657,10 @@ static void velocity_error(struct velociif (linked) { vptr->mii_status &= ~VELOCITY_LINK_FAIL ; +netif_carrier_on (vptr->dev); }else { vptr->mii_status |=VELOCITY_LINK_FAIL ; +netif_carrier_off (vptr->dev); }velocity_print_link_status (vptr);
drivers/pnp/resource.c +2 -1
@@ -396,7 +396,8 @@ #endif/* check if the resource is already in use, skip if the * device is active because it itself may be in use */ if (!dev->active) { -if (request_irq (*irq, pnp_test_handler,SA_INTERRUPT ,"pnp" ,NULL )) +if (request_irq (*irq, pnp_test_handler, +SA_INTERRUPT |SA_PROBEIRQ ,"pnp" ,NULL ))return 0 ;free_irq (*irq,NULL ); }
drivers/serial/8250.c +9 -4
@@ -2241,10 +2241,14 @@ serial8250_console_write(struct consoletouch_nmi_watchdog (); -if (oops_in_progress) { - locked =spin_trylock_irqsave (&up->port.lock, flags); +local_irq_save (flags); +if (up->port.sysrq) { +/* serial8250_handle_port() already took the lock */ + locked =0 ; + }else if (oops_in_progress) { + locked =spin_trylock (&up->port.lock); }else -spin_lock_irqsave (&up->port.lock, flags); +spin_lock (&up->port.lock);/* * First save the IER then disable the interrupts
@@ -2266,7 +2270,8 @@ serial8250_console_write(struct consoleserial_out (up,UART_IER , ier);if (locked) -spin_unlock_irqrestore (&up->port.lock, flags); +spin_unlock (&up->port.lock); +local_irq_restore (flags); }static int serial8250_console_setup (struct console *co,char *options)
drivers/usb/serial/ftdi_sio.c +71 -13
148 lines not on this page · raw message
fs/file.c +3 -1
@@ -277,11 +277,13 @@ #endif }while (nfds <= nr); new_fds =alloc_fd_array (nfds);if (!new_fds) - goto out; + goto out2; fdt->fd = new_fds; fdt->max_fds = nfds; fdt->free_files =NULL ;return fdt; +out2: + nfds = fdt->max_fdset; out:if (new_openset)free_fdset (new_openset, nfds);
fs/namei.c +7 -1
@@ -1712,8 +1712,14 @@ do_link:if (error) goto exit_dput; error =__do_follow_link (&path, nd); -if (error) +if (error) { +/* Does someone understand code flow here? Or it is only +* me so stupid? Anathema to whoever designed this non-sense +* with "intent.open". +*/ +release_open_intent (nd);return error; + } nd->flags &= ~LOOKUP_PARENT ;if (nd->last_type ==LAST_BIND ) goto ok;
fs/splice.c +129 -101
283 lines not on this page · raw message
fs/xfs/xfs_dir2_node.c +1 -1
@@ -970,7 +970,7 @@ xfs_dir2_leafn_remove(/* * One less used entry in the free table. */ - free->hdr.nused =cpu_to_be32 (-1 ); +be32_add (&free->hdr.nused,-1 );xfs_dir2_free_log_header (tp, fbp);/* * If this was the last entry in the table, we can
include/sound/initval.h +2 -1
@@ -62,7 +62,8 @@ static int snd_legacy_find_free_irq(int {while (*irq_table !=-1 ) {if (!request_irq (*irq_table, snd_legacy_empty_irq_handler, -SA_INTERRUPT ,"ALSA Test IRQ" , (void *) irq_table)) { +SA_INTERRUPT |SA_PROBEIRQ ,"ALSA Test IRQ" , + (void *) irq_table)) {free_irq (*irq_table, (void *) irq_table);return *irq_table; }
mm/Kconfig +1 -1
@@ -115,7 +115,7 @@ config SPARSEMEM_EXTREME # eventually, we can have this option just 'select SPARSEMEM' config MEMORY_HOTPLUG bool "Allow for memory hot-add" - depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND + depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG comment "Memory hotplug is currently incompatible with Software Suspend" depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND
mm/filemap.c +19 -8
@@ -2004,14 +2004,21 @@ generic_file_buffered_write(struct kiocb do { unsigned long index; unsigned long offset; - unsigned long maxlen; size_t copied; offset = (pos & (PAGE_CACHE_SIZE -1)); /* Within page */ index = pos >> PAGE_CACHE_SHIFT; bytes = PAGE_CACHE_SIZE - offset; - if (bytes > count) - bytes = count; + + /* Limit the size of the copy to the caller's write size */ + bytes = min(bytes, count); + + /* + * Limit the size of the copy to that of the current segment, + * because fault_in_pages_readable() doesn't know how to walk + * segments. + */ + bytes = min(bytes, cur_iov->iov_len - iov_base); /* * Bring in the user page that we will copy from _first_.
@@ -2019,10 +2026,7 @@ generic_file_buffered_write(struct kiocb* same page as we're writing to, without it being marked * up-to-date. */ - maxlen = cur_iov->iov_len - iov_base; -if (maxlen > bytes) - maxlen = bytes; -fault_in_pages_readable (buf, maxlen); +fault_in_pages_readable (buf, bytes); page =__grab_cache_page (mapping,index,&cached_page,&lru_pvec);if (!page) {
@@ -2030,6 +2034,12 @@ generic_file_buffered_write(struct kiocbbreak ; } +if (unlikely (bytes ==0 )) { + status =0 ; + copied =0 ; + goto zero_length_segment; + } + status = a_ops->prepare_write (file, page, offset, offset+bytes);if (unlikely (status)) {loff_t isize =i_size_read (inode);
@@ -2059,7 +2069,8 @@ generic_file_buffered_write(struct kiocbpage_cache_release (page);continue ; } -if (likely (copied >0 )) { +zero_length_segment: +if (likely (copied >=0 )) {if (!status) status = copied;
mm/filemap.h +2 -2
@@ -78,7 +78,7 @@ filemap_set_next_iovec(const struct ioveconst struct iovec *iov = *iovp;size_t base = *basep; -while (bytes) { + do { int copy = min(bytes, iov->iov_len - base); bytes -= copy;
@@ -87,7 +87,7 @@ filemap_set_next_iovec(const struct iove iov++; base =0 ; } - } + }while (bytes); *iovp = iov; *basep = base; }
mm/pdflush.c +7 -8
@@ -104,21 +104,20 @@ static int __pdflush(struct pdflush_worklist_move (&my_work->list, &pdflush_list); my_work->when_i_went_to_sleep = jiffies;spin_unlock_irq (&pdflush_lock); -schedule (); -if (try_to_freeze ()) { -spin_lock_irq (&pdflush_lock); -continue ; - } - +try_to_freeze ();spin_lock_irq (&pdflush_lock);if (!list_empty (&my_work->list)) { -printk ("pdflush: bogus wakeup!\n" ); +/* +* Someone woke us up, but without removing our control +* structure from the global list. swsusp will do this +* in try_to_freeze()->refrigerator(). Handle it. +*/ my_work->fn =NULL ;continue ; }if (my_work->fn ==NULL ) { -printk ("pdflush: NULL work function\n" ); +printk ("pdflush: bogus wakeup\n" );continue ; }spin_unlock_irq (&pdflush_lock);
net/core/dev.c +1 -0
@@ -1246,6 +1246,7 @@ int __skb_linearize(struct sk_buff *skb,atomic_set (&ninfo->dataref,1 ); ninfo->tso_size =skb_shinfo (skb)->tso_size; ninfo->tso_segs =skb_shinfo (skb)->tso_segs; + ninfo->ufo_size =skb_shinfo (skb)->ufo_size; ninfo->nr_frags =0 ; ninfo->frag_list =NULL ;
net/core/ethtool.c +1 -1
@@ -437,7 +437,7 @@ static int ethtool_set_pauseparam(struct {struct ethtool_pauseparam pauseparam; -if (!dev->ethtool_ops->get_pauseparam) +if (!dev->ethtool_ops->set_pauseparam)return -EOPNOTSUPP ;if (copy_from_user (&pauseparam, useraddr,sizeof (pauseparam)))
net/core/skbuff.c +2 -0
@@ -240,6 +240,7 @@ struct sk_buff *alloc_skb_from_cache(kmeskb_shinfo (skb)->nr_frags =0 ;skb_shinfo (skb)->tso_size =0 ;skb_shinfo (skb)->tso_segs =0 ; +skb_shinfo (skb)->ufo_size =0 ;skb_shinfo (skb)->frag_list =NULL ; out:return skb;
@@ -529,6 +530,7 @@ #endifatomic_set (&new->users,1 );skb_shinfo (new)->tso_size =skb_shinfo (old)->tso_size;skb_shinfo (new)->tso_segs =skb_shinfo (old)->tso_segs; +skb_shinfo (new)->ufo_size =skb_shinfo (old)->ufo_size; }/**
net/decnet/dn_rules.c +2 -1
@@ -400,9 +400,10 @@ int dn_fib_dump_rules(struct sk_buff *skrcu_read_lock ();hlist_for_each_entry (r, node, &dn_fib_rules, r_hlist) {if (idx < s_idx) -continue ; + goto next;if (dn_fib_fill_rule (skb, r, cb,NLM_F_MULTI ) <0 )break ; +next: idx++; }rcu_read_unlock ();
net/ieee80211/Kconfig +1 -0
@@ -58,6 +58,7 @@ config IEEE80211_CRYPT_TKIP depends on IEEE80211 && NET_RADIO select CRYPTO select CRYPTO_MICHAEL_MIC + select CRC32 ---help--- Include software based cipher suites in support of IEEE 802.11i (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with TKIP enabled
net/ipv4/fib_rules.c +2 -2
@@ -458,13 +458,13 @@ int inet_dump_rules(struct sk_buff *skb,rcu_read_lock ();hlist_for_each_entry (r, node, &fib_rules, hlist) { -if (idx < s_idx) -continue ; + goto next;if (inet_fill_rule (skb, r,NETLINK_CB (cb->skb).pid, cb->nlh->nlmsg_seq,RTM_NEWRULE ,NLM_F_MULTI ) <0 )break ; +next: idx++; }rcu_read_unlock ();
net/sched/act_api.c +10 -8
@@ -251,15 +251,17 @@ tcf_action_dump(struct sk_buff *skb, strRTA_PUT (skb, a->order,0 ,NULL ); err =tcf_action_dump_1 (skb, a, bind, ref);if (err <0 ) - goto rtattr_failure; + goto errout; r->rta_len = skb->tail - (u8 *)r; }return 0 ; rtattr_failure: + err = -EINVAL ; +errout:skb_trim (skb, b - skb->data); -return -err; +return err; } struct tc_action *tcf_action_init_1(struct rtattr *rta, struct rtattr *est,
@@ -306,6 +308,7 @@ #ifdef CONFIG_KMOD goto err_mod; }#endif + *err = -ENOENT ; goto err_out; }
@@ -777,7 +780,7 @@ replay:return ret; } -static char * +static struct rtattr *find_dump_kind (struct nlmsghdr *n) {struct rtattr *tb1, *tb2[TCA_ACT_MAX +1 ];
@@ -805,7 +808,7 @@ find_dump_kind(struct nlmsghdr *n)return NULL ; kind = tb2[TCA_ACT_KIND -1 ]; -return (char *)RTA_DATA (kind); +return kind; } static int
@@ -818,16 +821,15 @@ tc_dump_action(struct sk_buff *skb, strustruct tc_action a;int ret =0 ;struct tcamsg *t = (struct tcamsg *)NLMSG_DATA (cb->nlh); -char *kind =find_dump_kind (cb->nlh); +struct rtattr *kind =find_dump_kind (cb->nlh);if (kind ==NULL ) {printk ("tc_dump_action: action bad kind\n" );return 0 ; } - a_o =tc_lookup_action_n (kind); + a_o =tc_lookup_action (kind);if (a_o ==NULL ) { -printk ("failed to find %s\n" , kind);return 0 ; }
@@ -835,7 +837,7 @@ tc_dump_action(struct sk_buff *skb, stru a.ops = a_o;if (a_o->walk ==NULL ) { -printk ("tc_dump_action: %s !capable of dumping table\n" , kind); +printk ("tc_dump_action: %s !capable of dumping table\n" , a_o->kind); goto rtattr_failure; }
sound/core/timer.c +3 -2
@@ -628,8 +628,9 @@ static void snd_timer_tasklet(unsigned lstruct snd_timer_instance *ti;struct list_head *p;unsigned long resolution, ticks; +unsigned long flags; -spin_lock (&timer->lock); +spin_lock_irqsave (&timer->lock, flags);/* now process all callbacks */ while (!list_empty (&timer->sack_list_head)) { p = timer->sack_list_head.next;/* get first item */
@@ -649,7 +650,7 @@ static void snd_timer_tasklet(unsigned lspin_lock (&timer->lock); ti->flags &= ~SNDRV_TIMER_IFLG_CALLBACK ; } -spin_unlock (&timer->lock); +spin_unlock_irqrestore (&timer->lock, flags); }/*
sound/isa/cs423x/Makefile +1 -0
@@ -11,6 +11,7 @@ snd-cs4236-objs := cs4236.o # Toplevel Module Dependency obj-$(CONFIG_SND_AZT2320) += snd-cs4231-lib.o +obj-$(CONFIG_SND_MIRO) += snd-cs4231-lib.o obj-$(CONFIG_SND_OPL3SA2) += snd-cs4231-lib.o obj-$(CONFIG_SND_CS4231) += snd-cs4231.o snd-cs4231-lib.o obj-$(CONFIG_SND_CS4232) += snd-cs4232.o snd-cs4231-lib.o
sound/pci/Kconfig +8 -6
@@ -318,17 +318,19 @@ config SND_FM801 To compile this driver as a module, choose M here: the module will be called snd-fm801. -config SND_FM801_TEA575X - tristate "ForteMedia FM801 + TEA5757 tuner" +config SND_FM801_TEA575X_BOOL + bool "ForteMedia FM801 + TEA5757 tuner" depends on SND_FM801 - select VIDEO_DEV help Say Y here to include support for soundcards based on the ForteMedia FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media - Forte SF256-PCS-02). + Forte SF256-PCS-02) into the snd-fm801 driver. - To compile this driver as a module, choose M here: the module - will be called snd-fm801-tea575x. +config SND_FM801_TEA575X + tristate + depends on SND_FM801_TEA575X_BOOL + default SND_FM801 + select VIDEO_DEV config SND_HDA_INTEL tristate "Intel HD Audio"
sound/pci/au88x0/au88x0_mpu401.c +1 -1
@@ -47,7 +47,7 @@ static int __devinit snd_vortex_midi(vorstruct snd_rawmidi *rmidi;int temp, mode;struct snd_mpu401 *mpu; -int port; +unsigned long port;#ifdef VORTEX_MPU401_LEGACY /* EnableHardCodedMPU401Port() */
sound/pci/fm801.c +1 -1
@@ -35,7 +35,7 @@ #include <sound/initval.h>#include <asm/io.h> -#if (defined(CONFIG_SND_FM801_TEA575X ) || defined(CONFIG_SND_FM801_TEA575X_MODULE )) && (defined(CONFIG_VIDEO_DEV ) || defined(CONFIG_VIDEO_DEV_MODULE )) +#ifdef CONFIG_SND_FM801_TEA575X_BOOL #include <sound/tea575x-tuner.h> #define TEA575X_RADIO 1#endif
sound/pci/hda/hda_intel.c +2 -2
@@ -1393,10 +1393,10 @@ static int azx_free(struct azx *chip)msleep (1 ); } -if (chip->remap_addr) -iounmap (chip->remap_addr);if (chip->irq >=0 )free_irq (chip->irq, (void *)chip); +if (chip->remap_addr) +iounmap (chip->remap_addr);if (chip->bdl.area)snd_dma_free_pages (&chip->bdl);
sound/pci/hda/patch_analog.c +13 -6
@@ -1488,6 +1488,9 @@ enum {/* reivision id to check workarounds */ #define AD1988A_REV2 0x100200 +#define is_rev2 (codec) \ + ((codec)->vendor_id == 0x11d41988 && \ + (codec)->revision_id == AD1988A_REV2)/* * mixers
@@ -1579,6 +1582,7 @@ static struct snd_kcontrol_new ad1988_6sHDA_CODEC_VOLUME_MONO ("Center Playback Volume" ,0x05 ,1 ,0x0 ,HDA_OUTPUT ),HDA_CODEC_VOLUME_MONO ("LFE Playback Volume" ,0x05 ,2 ,0x0 ,HDA_OUTPUT ), HDA_CODEC_VOLUME("Side Playback Volume", 0x0a, 0x0, HDA_OUTPUT), + { } /* end */ }; static struct snd_kcontrol_new ad1988_6stack_mixers1_rev2[] = {
@@ -1587,6 +1591,7 @@ static struct snd_kcontrol_new ad1988_6sHDA_CODEC_VOLUME_MONO ("Center Playback Volume" ,0x0a ,1 ,0x0 ,HDA_OUTPUT ),HDA_CODEC_VOLUME_MONO ("LFE Playback Volume" ,0x0a ,2 ,0x0 ,HDA_OUTPUT ), HDA_CODEC_VOLUME("Side Playback Volume", 0x06, 0x0, HDA_OUTPUT), + { } /* end */ }; static struct snd_kcontrol_new ad1988_6stack_mixers2[] = {
@@ -1625,6 +1630,7 @@ static struct snd_kcontrol_new ad1988_3sHDA_CODEC_VOLUME ("Surround Playback Volume" ,0x0a ,0x0 ,HDA_OUTPUT ),HDA_CODEC_VOLUME_MONO ("Center Playback Volume" ,0x05 ,1 ,0x0 ,HDA_OUTPUT ), HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x05, 2, 0x0, HDA_OUTPUT), + { } /* end */ }; static struct snd_kcontrol_new ad1988_3stack_mixers1_rev2[] = {
@@ -1632,6 +1638,7 @@ static struct snd_kcontrol_new ad1988_3sHDA_CODEC_VOLUME ("Surround Playback Volume" ,0x0a ,0x0 ,HDA_OUTPUT ),HDA_CODEC_VOLUME_MONO ("Center Playback Volume" ,0x06 ,1 ,0x0 ,HDA_OUTPUT ), HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x06, 2, 0x0, HDA_OUTPUT), + { } /* end */ }; static struct snd_kcontrol_new ad1988_3stack_mixers2[] = {
@@ -2138,7 +2145,7 @@ static inline hda_nid_t ad1988_idx_to_da/* A B C D E F G H */ 0x04, 0x05, 0x0a, 0x04, 0x06, 0x05, 0x0a, 0x06 }; -if (codec->revision_id ==AD1988A_REV2 ) +if (is_rev2 (codec))return idx_to_dac_rev2[idx];else return idx_to_dac[idx];
@@ -2507,7 +2514,7 @@ static int patch_ad1988(struct hda_codecmutex_init (&spec->amp_mutex); codec->spec = spec; -if (codec->revision_id ==AD1988A_REV2 ) +if (is_rev2 (codec))snd_printk (KERN_INFO "patch_analog: AD1988A rev.2 is detected, enable workarounds\n" ); board_config =snd_hda_check_board_config (codec, ad1988_cfg_tbl);
@@ -2533,13 +2540,13 @@ static int patch_ad1988(struct hda_codeccase AD1988_6STACK_DIG : spec->multiout.max_channels =8 ; spec->multiout.num_dacs =4 ; -if (codec->revision_id ==AD1988A_REV2 ) +if (is_rev2 (codec)) spec->multiout.dac_nids = ad1988_6stack_dac_nids_rev2;else spec->multiout.dac_nids = ad1988_6stack_dac_nids; spec->input_mux = &ad1988_6stack_capture_source; spec->num_mixers =2 ; -if (codec->revision_id ==AD1988A_REV2 ) +if (is_rev2 (codec)) spec->mixers[0 ] = ad1988_6stack_mixers1_rev2;else spec->mixers[0 ] = ad1988_6stack_mixers1;
@@ -2555,7 +2562,7 @@ static int patch_ad1988(struct hda_codeccase AD1988_3STACK_DIG : spec->multiout.max_channels =6 ; spec->multiout.num_dacs =3 ; -if (codec->revision_id ==AD1988A_REV2 ) +if (is_rev2 (codec)) spec->multiout.dac_nids = ad1988_3stack_dac_nids_rev2;else spec->multiout.dac_nids = ad1988_3stack_dac_nids;
@@ -2563,7 +2570,7 @@ static int patch_ad1988(struct hda_codec spec->channel_mode = ad1988_3stack_modes; spec->num_channel_mode =ARRAY_SIZE (ad1988_3stack_modes); spec->num_mixers =2 ; -if (codec->revision_id ==AD1988A_REV2 ) +if (is_rev2 (codec)) spec->mixers[0 ] = ad1988_3stack_mixers1_rev2;else spec->mixers[0 ] = ad1988_3stack_mixers1;
sound/pci/hda/patch_realtek.c +1 -1
@@ -3827,7 +3827,7 @@ static struct hda_board_config alc260_cf { .modelname = "hp", .config = ALC260_HP }, { .pci_subvendor = 0x103c, .pci_subdevice = 0x3010, .config = ALC260_HP }, { .pci_subvendor = 0x103c, .pci_subdevice = 0x3011, .config = ALC260_HP }, - { .pci_subvendor = 0x103c, .pci_subdevice = 0x3012, .config = ALC260_HP }, + { .pci_subvendor = 0x103c, .pci_subdevice = 0x3012, .config = ALC260_HP_3013 }, { .pci_subvendor = 0x103c, .pci_subdevice = 0x3013, .config = ALC260_HP_3013 }, { .pci_subvendor = 0x103c, .pci_subdevice = 0x3014, .config = ALC260_HP }, { .pci_subvendor = 0x103c, .pci_subdevice = 0x3015, .config = ALC260_HP },
sound/pci/hda/patch_sigmatel.c +4 -4
@@ -1262,13 +1262,13 @@ static int vaio_master_sw_put(struct sndint change; change =snd_hda_codec_amp_update (codec,0x02 ,0 ,HDA_OUTPUT ,0 , -0x80 , valp[0 ] &0x80 ); +0x80 , (valp[0 ] ?0 :0x80 )); change |=snd_hda_codec_amp_update (codec,0x02 ,1 ,HDA_OUTPUT ,0 , -0x80 , valp[1 ] &0x80 ); +0x80 , (valp[1 ] ?0 :0x80 ));snd_hda_codec_amp_update (codec,0x05 ,0 ,HDA_OUTPUT ,0 , -0x80 , valp[0 ] &0x80 ); +0x80 , (valp[0 ] ?0 :0x80 ));snd_hda_codec_amp_update (codec,0x05 ,1 ,HDA_OUTPUT ,0 , -0x80 , valp[1 ] &0x80 ); +0x80 , (valp[1 ] ?0 :0x80 ));return change; }
sound/pci/rme9652/hdsp.c +3 -2
@@ -389,7 +389,7 @@ #define HDSP_DMA_AREA_KILOBYTES (HDSP_DM/* use hotplug firmeare loader? */ #if defined(CONFIG_FW_LOADER ) || defined(CONFIG_FW_LOADER_MODULE ) -#ifndef HDSP_USE_HWDEP_LOADER +#if !defined(HDSP_USE_HWDEP_LOADER ) && !defined(CONFIG_SND_HDSP )#define HDSP_FW_LOADER #endif #endif
@@ -3169,9 +3169,10 @@ snd_hdsp_proc_read(struct snd_info_entrychar *clock_source;int x; -if (hdsp_check_for_iobox (hdsp)) +if (hdsp_check_for_iobox (hdsp)) {snd_iprintf (buffer,"No I/O box connected.\nPlease connect one and upload firmware.\n" );return ; + }if (hdsp_check_for_firmware (hdsp,0 )) {if (hdsp->state & HDSP_FirmwareCached) {
Greg KH <[email protected]> writes:
Hi,
Quoted 1 line
We (the -stable team) are announcing the release of the 2.6.17.7 kernel.
Sorry, but doesn't compile if DVB_BUDGET_AV is set :(
Quoted 3 lines
Andrew de Quincey:
v4l/dvb: Fix budget-av frontend detection
v4l/dvb: Fix CI on old KNC1 DVBC cards
This patch is the culprit. With it, the build fails with the errors :drivers/media/dvb/ttpci/budget-av.c: In function 'frontend_init':drivers/media/dvb/ttpci/budget-av.c:1063: error: 'struct budget_av' has no member named 'reinitialise_demod' drivers/media/dvb/ttpci/budget-av.c:1068: error: request for member tuner_ops' in something not a structure or union drivers/media/dvb/ttpci/budget-av.c:1068: error: 'philips_cu1216_tuner_set_params' undeclared (first use in this function) drivers/media/dvb/ttpci/budget-av.c:1068: error: (Each undeclared identifier is reported only once drivers/media/dvb/ttpci/budget-av.c:1068: error: for each function it appears in.)
The needed changes were introduced post 2.6.17 :5c1208ba457a1668c81868060c08496a2d053be07eef5dd6daecf3ee305116c9cf41ae7166270c4ce87d41c4952ceef7a9f760f38f9343d015279662
This would be great to see this fixed for the next -stable release :)
Regards,
Arnaud Patard
Quoted 10 lines · Arnaud Patard
Greg KH <[email protected]> writes:
Hi,
Quoted 1 line
We (the -stable team) are announcing the release of the 2.6.17.7 kernel.
Sorry, but doesn't compile if
DVB_BUDGET_AVis set :(Quoted 2 lines
Andrew de Quincey:
v4l/dvb: Fix budget-av frontend detection
In fact it is just this patch causing the problem:
Quoted 13 lines
Quoted 1 line
v4l/dvb: Fix CI on old KNC1 DVBC cards
This patch is the culprit. With it, the build fails with the errors :
drivers/media/dvb/ttpci/budget-av.c: In function 'frontend_init':drivers/media/dvb/ttpci/budget-av.c:1063: error: 'structbudget_av' has no member named 'reinitialise_demod'drivers/media/dvb/ttpci/budget-av.c:1068:
error: request for membertuner_ops' in something not a structure or uniondrivers/media/dvb/ttpci/budget-av.c:1068: error:
'philips_cu1216_tuner_set_params' undeclared (first use in this function)drivers/media/dvb/ttpci/budget-av.c:1068: error: (Each undeclared identifier is reported only oncedrivers/media/dvb/ttpci/budget-av.c:1068:
error: for each function it appears in.)
Quoted 6 lines
The needed changes were introduced post 2.6.17 :
5c1208ba457a1668c81868060c08496a2d053be07eef5dd6daecf3ee305116c9cf41ae7166270c4ce87d41c4952ceef7a9f760f38f9343d015279662This would be great to see this fixed for the next -stable release :)
Sorry, I had so much work going on in that area I must have diffed the wrong kernel when I created this patch. :(
automated test? (was Re: Linux 2.6.17.7)
Quoted 14 lines · Andrew de Quincey
Quoted 10 lines · Arnaud Patard
Greg KH <[email protected]> writes:
Hi,
Quoted 1 line
We (the -stable team) are announcing the release of the 2.6.17.7 kernel.
Sorry, but doesn't compile if
DVB_BUDGET_AVis set :(Quoted 2 lines
Andrew de Quincey:
v4l/dvb: Fix budget-av frontend detectionIn fact it is just this patch causing the problem:
<SNIP>
Quoted 2 lines
Sorry, I had so much work going on in that area I must have diffed the wrong kernel when I created this patch. :(
is it reasonable to have an aotomated test figure out what config options are relavent to a patch (or patchset) and test compile all the combinations to catch this sort of mistake?
David Lang
Re: automated test? (was Re: Linux 2.6.17.7)
Quoted 15 lines · David Lang
Quoted 13 lines · Andrew de Quincey
Quoted 10 lines · Arnaud Patard
Greg KH <[email protected]> writes:
Hi,
Quoted 1 line
We (the -stable team) are announcing the release of the 2.6.17.7 kernel.
Sorry, but doesn't compile if
DVB_BUDGET_AVis set :(Quoted 2 lines
Andrew de Quincey:
v4l/dvb: Fix budget-av frontend detection
Quoted 8 lines
Quoted 1 line
In fact it is just this patch causing the problem:
<SNIP>
Quoted 2 lines
Sorry, I had so much work going on in that area I must have diffed the wrong kernel when I created this patch. :(
is it reasonable to have an aotomated test figure out what config options are relavent to a patch (or patchset) and test compile all the combinations to catch this sort of mistake?
well you can do such a thing withing statistical bounds; however... if the patch already is in -git (as is -stable policy normally).. it should have been found there already...
Signature · 1 line
if you want to mail me at work (you don't), use arjan (at) linux.intel.com
Re: automated test? (was Re: Linux 2.6.17.7)
Quoted 18 lines · Arjan van de Ven
Quoted 17 lines · David Lang
Quoted 12 lines · Andrew de Quincey
Quoted 9 lines · Arnaud Patard
Greg KH <[email protected]> writes:
Hi,
Quoted 1 line
We (the -stable team) are announcing the release of the 2.6.17.7 kernel.
Sorry, but doesn't compile if
DVB_BUDGET_AVis set :(Quoted 2 lines
Andrew de Quincey:
v4l/dvb: Fix budget-av frontend detectionIn fact it is just this patch causing the problem:
<SNIP>
Quoted 2 lines
Sorry, I had so much work going on in that area I must have diffed the wrong kernel when I created this patch. :(
Quoted 9 lines
Quoted 3 lines
is it reasonable to have an aotomated test figure out what config options are relavent to a patch (or patchset) and test compile all the combinations to catch this sort of mistake?
well you can do such a thing withing statistical bounds; however... if the patch already is in -git (as is -stable policy normally).. it should have been found there already...
In this case it isn't quite that simple...
The DVB tree is in the midst of tuner refactoring, and somehow the diff was generated against the wrong tree.
The fix can be found here... We'll need this queued up for 2.6.17.8 ...
I have already attached this inline in a prior email, not sure how many
people have seen that yet...
You can also get it from here:
http://linuxtv.org/~mkrufky/stable/2.6.17.y/budget-av-compile-fix.patch
---
[PATCH 2.6.17.7] Fix budget-av compile failure
From: Andrew de Quincey <[email protected]>
Currently I am doing lots of refactoring work in the dvb tree. This bugfix became necessary to fix 2.6.17 whilst I was in the middle of this work. Unfortunately after I tested the original code for the patch, I generated the diff against the wrong tree (I accidentally used a tree with part of the refactoring code in it). This resulted in the reported compile errors because that tree (a) was incomplete, and (b) used features which are simply not in the mainline kernel yet.
Many apologies for the error and problems this has caused. :(
diff -Naur linux-2.6.17.7.orig/drivers/media/dvb/ttpci/budget-av.c linux-2.6.17.7/drivers/media/dvb/ttpci/budget-av.c
--- linux-2.6.17.7.orig/drivers/media/dvb/ttpci/budget-av.c 2006-07-25 14:53:19.000000000 +0100
+++ linux-2.6.17.7/drivers/media/dvb/ttpci/budget-av.c 2006-07-25 15:25:32.000000000 +0100
@@ -58,6 +58,7 @@
struct tasklet_struct ciintf_irq_tasklet;
int slot_status;
struct dvb_ca_en50221 ca;
+ u8 reinitialise_demod:1;
};
/* GPIO Connections:
@@ -214,8 +215,9 @@
while (--timeout > 0 && ciintf_read_attribute_mem(ca, slot, 0) != 0x1d)
msleep(100);
- /* reinitialise the frontend */
- dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);
+ /* reinitialise the frontend if necessary */
+ if (budget_av->reinitialise_demod)
+ dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);
if (timeout <= 0)
{
@@ -1064,12 +1066,10 @@
fe = tda10021_attach(&philips_cu1216_config,
&budget_av->budget.i2c_adap, read_pwm(budget_av));
- if (fe) {
- fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set_params;
- }
break;
case SUBID_DVBC_KNC1_PLUS:
+ budget_av->reinitialise_demod = 1;
fe = tda10021_attach(&philips_cu1216_config,
&budget_av->budget.i2c_adap, read_pwm(budget_av));
Signature · 1 line
Michael Krufky
Re: automated test? (was Re: Linux 2.6.17.7)
Hi Michael,
Quoted 7 lines
The fix can be found here... We'll need this queued up for 2.6.17.8 ...
I have already attached this inline in a prior email, not sure how many
people have seen that yet...You can also get it from here:
http://linuxtv.org/~mkrufky/stable/2.6.17.y/budget-av-compile-fix.patch
Yes, it fixed the compilation cleanly for me (on both i386 and x86_64). I can't test beyond that though, as I don't have that specific hardware.
Thanks,
Signature · 1 line
Jean Delvare
Re: automated test? (was Re: Linux 2.6.17.7)
Quoted 6 lines · Jean Delvare
Hi Michael,
Quoted 4 lines
The fix can be found here... We'll need this queued up for 2.6.17.8 ...
I have already attached this inline in a prior email, not sure how many
people have seen that yet...
Quoted 6 lines
Quoted 3 lines
You can also get it from here:
http://linuxtv.org/~mkrufky/stable/2.6.17.y/budget-av-compile-fix.patch
Yes, it fixed the compilation cleanly for me (on both i386 and
x86_64). I can't test beyond that though, as I don't have that specific hardware.
Great thanks for testing!
As for not having specific hardware for testing, I have the same problem. Its a continuing problem with DVB and the source of many regressions :(
Re: automated test? (was Re: Linux 2.6.17.7)
In reply to Arjan van de VenQuoted 3 lines · Arjan van de Ven
well you can do such a thing withing statistical bounds; however... if the patch already is in -git (as is -stable policy normally).. it should have been found there already...
The sad facts I learned from Debian bug #212762 (not kernel related) that culminated in CVE-2005-2335 (remote root exploit against older fetchmail) and from various qmail bugs Guninski discovered:
- a bug need not necessarily be found soon after introduction
- a bug report may not convey the hint "look at this NOW, the shit already hit the fan"
(sorry, I meant to write: look NOW, it's urgent and important)
- an automated test to catch non-trivial mistakes is non-trivial in itself, and - what I've seen with another project I was involved with, and more often than I found amusing - is that the test itself can be buggy causing bogus results.
That doesn't mean I object to automated tests, but "it should have been found by now" (because the source is open, someone could have tested it, whatever) just doesn't work.
Signature · 1 line
Matthias Andree
Re: automated test? (was Re: Linux 2.6.17.7)
Quoted 16 lines · Matthias Andree
Quoted 3 lines · Arjan van de Ven
well you can do such a thing withing statistical bounds; however... if the patch already is in -git (as is -stable policy normally).. it should have been found there already...
The sad facts I learned from Debian bug #212762 (not kernel related) that culminated in CVE-2005-2335 (remote root exploit against older fetchmail) and from various qmail bugs Guninski discovered:
- a bug need not necessarily be found soon after introduction
- a bug report may not convey the hint "look at this NOW, the shit already hit the fan"
(sorry, I meant to write: look NOW, it's urgent and important)
Quoted 8 lines
- an automated test to catch non-trivial mistakes is non-trivial in itself, and - what I've seen with another project I was involved with, and more often than I found amusing - is that the test itself can be buggy causing bogus results.
That doesn't mean I object to automated tests, but "it should have been found by now" (because the source is open, someone could have tested it, whatever) just doesn't work.
what I was intending with my origional question was a series of simple 'does it compile' tests that try all the config options that are affected by the patchset in question. the purpose being to catch simple errors like the one here where the patch was diffed against the wrong tree and the result doesn't compile
i.e. if the change is the the e1000 driver, try compiling a kernel with it on, off, and as a module
obviously such a test can't be done on the huge -rc patches (they would approach an exhaustive test of all config permutations), but for -stable patches (or better still the indivdual patches that form a -stable release)
so the first part of the question boils down to
1. Given a patch that modifies file X is it possible to know what config options could be affected?
and the second part would be
2. would it make sense for the LTP or one of the big compile farms to do a series of compiles prior to the release of a -stable kernel to catch mistakes like this?
David Lang
Re: automated test? (was Re: Linux 2.6.17.7)
In reply to David LangQuoted 15 lines · David Lang
Quoted 13 lines · Andrew de Quincey
Quoted 10 lines · Arnaud Patard
Greg KH <[email protected]> writes:
Hi,
Quoted 1 line
We (the -stable team) are announcing the release of the 2.6.17.7 kernel.
Sorry, but doesn't compile if
DVB_BUDGET_AVis set :(Quoted 2 lines
Andrew de Quincey:
v4l/dvb: Fix budget-av frontend detection
Quoted 8 lines
Quoted 1 line
In fact it is just this patch causing the problem:
<SNIP>
Quoted 2 lines
Sorry, I had so much work going on in that area I must have diffed the wrong kernel when I created this patch. :(
is it reasonable to have an aotomated test figure out what config options are relavent to a patch (or patchset) and test compile all the combinations to catch this sort of mistake?
you'll probably need to find some heuristics which may be quite hard to do. It would be easier imho to use some scripts like this one :
http://developer.osdl.org/~cherry/compile/
It's often enough to catch compile failures
Arnaud Patard
Quoted 2 lines
David Lang
Re: automated test? (was Re: Linux 2.6.17.7)
In reply to David LangQuoted 16 lines · David Lang
Quoted 7 lines · Andrew de Quincey
Quoted 6 lines · Arnaud Patard
Greg KH <[email protected]> writes:
Hi,
Quoted 1 line
We (the -stable team) are announcing the release of the 2.6.17.7 kernel.
Quoted 7 lines
Quoted 4 lines
Sorry, but doesn't compile if
DVB_BUDGET_AVis set :(Quoted 2 lines
Andrew de Quincey:
v4l/dvb: Fix budget-av frontend detectionIn fact it is just this patch causing the problem:
Quoted 8 lines
<SNIP>
Quoted 3 lines
Sorry, I had so much work going on in that area I must have diffed the wrong
kernel when I created this patch. :(is it reasonable to have an aotomated test figure out what config options are relavent to a patch (or patchset) and test compile all the combinations to catch this sort of mistake?
If you think about it, you'll notice it's definitely not reasonable:
#include <linux/module.h> brings you a dependency on 5 config options. #include <linux/pci.h> brings you a dependency on 6 config options.
By only including these two headers you are at 2048 combinations. The number of valid configurations will be lower, but 500 test compiles sound realistically.
With have a dozen #include's you might need more than a million test compiles.
With a dozen #include's, you might need a trilion [1] test compiles.
Compile errors are quickly catched and don't cause any serious problem.
What bothers me more is that noone tested this patch against the kernel it was applied against.
The submitter didn't test it works (he didn't even test the compilation).
No user tested it.
Currently, -stable kernels get an 48 hours review on linux-kernel but zero testing.
How could this be improved?
Longer review/testing time?
Offer them as also one 2.6.17.7-rc1 patch?
Quoted 1 line
David Lang
cu
Adrian
[1] American English
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedRe: automated test? (was Re: Linux 2.6.17.7)
Quoted 42 lines · Adrian Bunk
Quoted 18 lines · David Lang
Quoted 14 lines · Andrew de Quincey
Quoted 11 lines · Arnaud Patard
Greg KH <[email protected]> writes:
Hi,
Quoted 2 lines
We (the -stable team) are announcing the release of the 2.6.17.7 kernel.
Sorry, but doesn't compile if
DVB_BUDGET_AVis set :(Quoted 2 lines
Andrew de Quincey:
v4l/dvb: Fix budget-av frontend detectionIn fact it is just this patch causing the problem:
<SNIP>
Quoted 7 lines
Quoted 3 lines
Sorry, I had so much work going on in that area I must have diffed the wrong
kernel when I created this patch. :(is it reasonable to have an aotomated test figure out what config options are relavent to a patch (or patchset) and test compile all the combinations to catch this sort of mistake?
If you think about it, you'll notice it's definitely not reasonable:
#include <
linux/module.h> brings you a dependency on 5 config options. #include <linux/pci.h> brings you a dependency on 6 config options.By only including these two headers you are at 2048 combinations. The number of valid configurations will be lower, but 500 test compiles sound realistically.
With have a dozen #include's you might need more than a million test compiles.
With a dozen #include's, you might need a trilion [1] test compiles.
Quoted 6 lines
Compile errors are quickly catched and don't cause any serious problem.
What bothers me more is that noone tested this patch against the kernel it was applied against.
The submitter didn't test it works (he didn't even test the compilation).
Yes I did - I didn't test the final generated patch unfortunately since I assumed it worked. The kernel I _meant_ to diff against worked perfectly :(
Re: automated test? (was Re: Linux 2.6.17.7)
Quoted 9 lines · Andrew de Quincey
On Wednesday 26 July 2006 14:02, Adrian Bunk wrote:
...Quoted 4 lines
What bothers me more is that noone tested this patch against the kernel it was applied against.
The submitter didn't test it works (he didn't even test the compilation).
Yes I did - I didn't test the final generated patch unfortunately since I assumed it worked. The kernel I _meant_ to diff against worked perfectly :(
Sorry if this was wrong, it wasn't meant against you personally.
Things do go wrong. That's life.
And you aren't the first person who sent a patch that broke the compilation of the next -stable kernel.
The real problem is:
How do we get some testing coverage of -stable kernels by users to catch issues?
And compile errors are the least of my worries.
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedRe: automated test? (was Re: Linux 2.6.17.7)
Quoted 14 lines · Adrian Bunk
Quoted 6 lines · Andrew de Quincey
On Wednesday 26 July 2006 14:02, Adrian Bunk wrote:
...Quoted 3 lines
What bothers me more is that noone tested this patch against the kernel it was applied against.
Quoted 6 lines
Quoted 2 lines
The submitter didn't test it works (he didn't even test the compilation).
Yes I did - I didn't test the final generated patch unfortunately since I assumed it worked. The kernel I _meant_ to diff against worked perfectly :(
Quoted 5 lines
Sorry if this was wrong, it wasn't meant against you personally.
Things do go wrong. That's life.
And you aren't the first person who sent a patch that broke the compilation of the next -stable kernel.
thanks. I feel a little bit better :)
Quoted 4 lines
The real problem is:
How do we get some testing coverage of -stable kernels by users to catch issues?
And compile errors are the least of my worries.
Yeah - I believe some people did test the DVB -stable patches, but obviously without the budget-av driver compile option enabled, so it didn't compile that code. DVB supports quite a few cards, so its easy to accidentally leave off one of the options when doing a mass compile of all drivers.
The only thing I can think of would be to require -stable patch submitters to supply a list of CONFIG options that must be on to enable compilation of the new code so people know exactly how to enable it for testing... but obviously since those would be manually specified, they can be wrong too. But at least it would show they'd thought about it a bit....
Re: automated test? (was Re: Linux 2.6.17.7)
Quoted 12 lines · Andrew de Quincey
On Wednesday 26 July 2006 15:29, Adrian Bunk wrote:
...Quoted 4 lines
The real problem is:
How do we get some testing coverage of -stable kernels by users to catch issues?
And compile errors are the least of my worries.Yeah - I believe some people did test the DVB -stable patches, but obviously without the budget-av driver compile option enabled, so it didn't compile that code. DVB supports quite a few cards, so its easy to accidentally leave off one of the options when doing a mass compile of all drivers.
Quoted 5 lines
The only thing I can think of would be to require -stable patch submitters to supply a list of CONFIG options that must be on to enable compilation of the new code so people know exactly how to enable it for testing... but obviously since those would be manually specified, they can be wrong too. But at least it would show they'd thought about it a bit....
This helps only with compilation errors, which are as I said the least of my worries.
But does the hardware driven by this driver work?
And if it does, is there a bug in the patch that causes the kernel to crash after some hours?
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedRe: automated test? (was Re: Linux 2.6.17.7)
Quoted 22 lines · Adrian Bunk
Quoted 14 lines · Andrew de Quincey
On Wednesday 26 July 2006 15:29, Adrian Bunk wrote:
...Quoted 4 lines
The real problem is:
How do we get some testing coverage of -stable kernels by users to catch issues?
And compile errors are the least of my worries.Yeah - I believe some people did test the DVB -stable patches, but obviously without the budget-av driver compile option enabled, so it didn't compile that code. DVB supports quite a few cards, so its easy to accidentally leave off one of the options when doing a mass compile of all drivers.
Quoted 6 lines
The only thing I can think of would be to require -stable patch submitters to supply a list of CONFIG options that must be on to enable compilation of the new code so people know exactly how to enable it for testing... but obviously since those would be manually specified, they can be wrong too. But at least it would show they'd thought about it a bit....
Quoted 6 lines
This helps only with compilation errors, which are as I said the least of my worries.
But does the hardware driven by this driver work?
And if it does, is there a bug in the patch that causes the kernel to crash after some hours?
That is a major problem with DVB development; no developer has all the hardware (in fact there is lots of hardware no developer has regular access to). Non-developers do test stuff in our HG repository, but again, the test coverage is very quite, since only some people do this, and most non-developers have only a few pieces of hardware.
Many people wait till it comes out in the vanilla kernel... which is why there were so many bugfixes from me in 2.6.17.7, as it was the first real test of several new features/card supports.
Re: automated test? (was Re: Linux 2.6.17.7)
In reply to Adrian BunkQuoted 13 lines · Adrian Bunk
Quoted 12 lines · Andrew de Quincey
On Wednesday 26 July 2006 15:29, Adrian Bunk wrote:
...Quoted 4 lines
The real problem is:
How do we get some testing coverage of -stable kernels by users to catch issues?
And compile errors are the least of my worries.Yeah - I believe some people did test the DVB -stable patches, but obviously without the budget-av driver compile option enabled, so it didn't compile that code. DVB supports quite a few cards, so its easy to accidentally leave off one of the options when doing a mass compile of all drivers.
Quoted 8 lines
Quoted 5 lines
The only thing I can think of would be to require -stable patch submitters to supply a list of CONFIG options that must be on to enable compilation of the new code so people know exactly how to enable it for testing... but obviously since those would be manually specified, they can be wrong too. But at least it would show they'd thought about it a bit....
This helps only with compilation errors, which are as I said the least of my worries.
however, this can be automaticly tested (or at least the config options specified can be tested)
Quoted 3 lines
But does the hardware driven by this driver work?
And if it does, is there a bug in the patch that causes the kernel to crash after some hours?
this cannot be tested by anyone who doesn't use the driver in question, and frequently that includes the programmer who makes the changes.
there's no way to protect against a logic error in a driver, however it is possible to put a safety net in place to catch compile problems due to mistakes.
should such a net be put into place? (along with asking submitters what compile options are relavent to their code), or is this a mistake that is rare enough to just live with it when it happens?
David Lang