Linux 3.0.10
I'm announcing the release of the 3.0.10 kernel.
All users of the 3.0 kernel series must upgrade.
The updated 3.0.y git tree can be found at (NOTE THE ADDRESS CHANGE):
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.0.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/powerpc/include/asm/sections.h | 2 arch/powerpc/include/asm/synch.h | 1 arch/powerpc/kernel/kvm.c | 1 arch/powerpc/kernel/setup_32.c | 2 arch/powerpc/kernel/setup_64.c | 1 arch/powerpc/lib/feature-fixups.c | 23 +++++ arch/powerpc/platforms/ps3/interrupt.c | 23 +++++ arch/powerpc/platforms/ps3/platform.h | 1 arch/powerpc/platforms/ps3/smp.c | 2 arch/sh/include/asm/page.h | 5 + arch/x86/platform/mrst/mrst.c | 24 +++--- arch/x86/xen/enlighten.c | 3 block/blk-map.c | 7 + drivers/gpu/drm/i915/i915_debugfs.c | 2 drivers/gpu/drm/i915/i915_gem.c | 2 drivers/gpu/drm/i915/intel_display.c | 4 - drivers/gpu/drm/nouveau/nouveau_channel.c | 1 drivers/gpu/drm/nouveau/nouveau_fence.c | 2 drivers/gpu/drm/radeon/atombios_dp.c | 2 drivers/leds/led-class.c | 5 - drivers/md/raid5.c | 32 +++++--- drivers/mfd/twl-core.c | 2 drivers/net/wireless/b43/main.c | 7 + drivers/virtio/virtio_pci.c | 11 +- drivers/xen/gntalloc.c | 4 - fs/hfs/trans.c | 2 include/drm/drm_pciids.h | 2 mm/backing-dev.c | 8 ++ security/keys/user_defined.c | 3 sound/pci/hda/hda_codec.c | 60 +++++++++------ sound/soc/codecs/wm8994.c | 2 sound/usb/mixer.c | 120 +++++++++++++++++------------- 33 files changed, 244 insertions(+), 124 deletions(-)
Alex Deucher (2):
drm/radeon/kms: make an aux failure debug only drm/radeon: add some missing FireMV pci ids
Anton Blanchard (1):
powerpc: Copy down exception vectors after feature fixups
Ben Hutchings (1):
block: Always check length of all iov entries in blk_rq_map_user_iov()
Dan Carpenter (3):
hfs: add sanity check for file name length
xen-gntalloc: integer overflow in gntalloc_ioctl_alloc()
xen-gntalloc: signedness bug in add_grefs()
David Howells (1):
KEYS: Fix a NULL pointer deref in the user-defined key type
Eric Anholt (1):
drm/i915: Fix object refcount leak on mmappable size limit error path.
Geoff Levand (1):
powerpc/ps3: Fix lost SMP IPIs
Greg Kroah-Hartman (1):
Linux 3.0.10
Jesse Barnes (1):
drm/i915: enable ring freq scaling, RC6 and graphics turbo on Ivy Bridge v3
Johan Hovold (1):
Revert "leds: save the delay values after a successful call to blink_set()"
Kirill A. Shutemov (1):
sfi: table irq 0xFF means 'no interrupt'
Marcin Slusarz (1):
drm/nouveau: initialize chan->fence.lock before use
Mark Brown (1):
ASoC: Don't use wm8994->control_data in wm8994_readable_register()
Michael S. Tsirkin (1):
virtio-pci: fix use after free
Mika Westerberg (1):
x86, mrst: use a temporary variable for SFI irq
NeilBrown (1):
md/raid5: abort any pending parity operations when array fails.
Nobuhiro Iwamatsu (1):
sh: Fix cached/uncaced address calculation in 29bit mode
Rabin Vincent (1):
backing-dev: ensure wakeup_timer is deleted
Rafał Miłecki (1):
b43: refuse to load unsupported firmware
Takashi Iwai (3):
ALSA: hda - Don't add elements of other codecs to vmaster slave
ALSA: usb-audio - Check the dB-range validity in the later read, too
ALSA: usb-audio - Fix the missing volume quirks at delayed init
Thomas Weber (1):
mfd: Fix twl4030 dependencies for audio codec
Zhenzhong Duan (1):
xen:pvhvm: enable PVHVM VCPU placement when using more than 32 CPUs.
# resend with the correct patch this time, sorry...
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 9 +SUBLEVEL = 10 EXTRAVERSION = NAME = Sneaky Weasel
arch/powerpc/include/asm/sections.h +1 -1
@@ -8,7 +8,7 @@#ifdef __powerpc64__ -extern char _end[]; +extern char __end_interrupts[];static inline int in_kernel_text (unsigned long addr) {
arch/powerpc/include/asm/synch.h +1 -0
@@ -13,6 +13,7 @@extern unsigned int __start___lwsync_fixup, __stop___lwsync_fixup;extern void do_lwsync_fixups (unsigned long value,void *fixup_start,void *fixup_end); +extern void do_final_fixups (void );static inline void eieio (void ) {
arch/powerpc/kernel/kvm.c +0 -1
@@ -131,7 +131,6 @@ static void kvm_patch_ins_b(u32 *inst, int addr)/* On relocatable kernels interrupts handlers and our code can be in different regions, so we don't patch them */ -extern u32 __end_interrupts;if ((ulong )inst < (ulong)&__end_interrupts)return ;#endif
arch/powerpc/kernel/setup_32.c +2 -0
@@ -107,6 +107,8 @@ notrace unsigned long __init early_init(unsigned long dt_ptr)PTRRELOC (&__start___lwsync_fixup), PTRRELOC(&__stop___lwsync_fixup)); +do_final_fixups (); +return KERNELBASE + offset; }
arch/powerpc/kernel/setup_64.c +1 -0
@@ -352,6 +352,7 @@ void __init setup_system(void) &__start___fw_ftr_fixup, &__stop___fw_ftr_fixup);do_lwsync_fixups (cur_cpu_spec->cpu_features, &__start___lwsync_fixup, &__stop___lwsync_fixup); +do_final_fixups ();/* * Unflatten the device-tree passed by prom_init or kexec
arch/powerpc/lib/feature-fixups.c +23 -0
@@ -18,6 +18,8 @@#include <linux/init.h> #include <asm/cputable.h> #include <asm/code-patching.h> +#include <asm/page.h> +#include <asm/sections.h> struct fixup_entry {
@@ -128,6 +130,27 @@ void do_lwsync_fixups(unsigned long value, void *fixup_start, void *fixup_end) } } +void do_final_fixups (void ) +{ +#if defined(CONFIG_PPC64 ) && defined(CONFIG_RELOCATABLE ) +int *src, *dest; +unsigned long length; + +if (PHYSICAL_START ==0 ) +return ; + + src = (int *)(KERNELBASE +PHYSICAL_START ); + dest = (int *)KERNELBASE ; + length = (__end_interrupts - _stext) /sizeof (int ); + +while (length--) { +patch_instruction (dest, *src); + src++; + dest++; + } +#endif +} +#ifdef CONFIG_FTR_FIXUP_SELFTEST #define check (x) \
arch/powerpc/platforms/ps3/interrupt.c +22 -1
@@ -88,6 +88,7 @@ struct ps3_private { struct ps3_bmp bmp __attribute__ ((aligned (PS3_BMP_MINALIGN)));u64 ppe_id;u64 thread_id; +unsigned long ipi_mask; }; static DEFINE_PER_CPU(struct ps3_private, ps3_private);
@@ -144,7 +145,11 @@ static void ps3_chip_unmask(struct irq_data *d)static void ps3_chip_eoi (struct irq_data *d) {const struct ps3_private *pd =irq_data_get_irq_chip_data (d); -lv1_end_of_interrupt_ext (pd->ppe_id, pd->thread_id, d->irq); + +/* non-IPIs are EOIed here. */ + +if (!test_bit (63 - d->irq, &pd->ipi_mask)) +lv1_end_of_interrupt_ext (pd->ppe_id, pd->thread_id, d->irq); }/**
@@ -691,6 +696,16 @@ void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq) cpu, virq, pd->bmp.ipi_debug_brk_mask); } +void __init ps3_register_ipi_irq (unsigned int cpu,unsigned int virq) +{ +struct ps3_private *pd = &per_cpu (ps3_private, cpu); + +set_bit (63 - virq, &pd->ipi_mask); + +DBG ("%s:%d: cpu %u, virq %u, ipi_mask %lxh\n" , __func__, __LINE__, + cpu, virq, pd->ipi_mask); +} +static unsigned int ps3_get_irq (void ) {struct ps3_private *pd = &__get_cpu_var (ps3_private);
@@ -720,6 +735,12 @@ static unsigned int ps3_get_irq(void) BUG(); }#endif + +/* IPIs are EOIed here. */ + +if (test_bit (63 - plug, &pd->ipi_mask)) +lv1_end_of_interrupt_ext (pd->ppe_id, pd->thread_id, plug); +return plug; }
arch/powerpc/platforms/ps3/platform.h +1 -0
@@ -43,6 +43,7 @@ void ps3_mm_shutdown(void);void ps3_init_IRQ (void );void ps3_shutdown_IRQ (int cpu);void __init ps3_register_ipi_debug_brk (unsigned int cpu,unsigned int virq); +void __init ps3_register_ipi_irq (unsigned int cpu,unsigned int virq);/* smp */
arch/powerpc/platforms/ps3/smp.c +2 -0
@@ -94,6 +94,8 @@ static void __init ps3_smp_setup_cpu(int cpu)if (result) virqs[i] =NO_IRQ ; +else +ps3_register_ipi_irq (cpu, virqs[i]); }ps3_register_ipi_debug_brk (cpu, virqs[PPC_MSG_DEBUGGER_BREAK ]);
arch/sh/include/asm/page.h +5 -0
@@ -141,8 +141,13 @@ typedef struct page *pgtable_t;#endif /* !__ASSEMBLY__ */ #ifdef CONFIG_UNCACHED_MAPPING +#if defined(CONFIG_29BIT ) +#define UNCAC_ADDR (addr) P2SEGADDR(addr) +#define CAC_ADDR (addr) P1SEGADDR(addr) +#else #define UNCAC_ADDR (addr) ((addr) - PAGE_OFFSET + uncached_start)#define CAC_ADDR (addr) ((addr) - uncached_start + PAGE_OFFSET) +#endif #else #define UNCAC_ADDR (addr) ((addr))#define CAC_ADDR (addr) ((addr))
arch/x86/platform/mrst/mrst.c +14 -10
@@ -678,36 +678,40 @@ static int __init sfi_parse_devs(struct sfi_table_header *table) pentry = (struct sfi_device_table_entry *)sb->pentry;for (i =0 ; i < num; i++, pentry++) { -if (pentry->irq != (u8 )0xff ) {/* native RTE case */ +int irq = pentry->irq; + +if (irq != (u8 )0xff ) {/* native RTE case */ /* these SPI2 devices are not exposed to system as PCI * devices, but they have separate RTE entry in IOAPIC * so we have to enable them one by one here */ - ioapic =mp_find_ioapic (pentry->irq); + ioapic =mp_find_ioapic (irq); irq_attr.ioapic = ioapic; - irq_attr.ioapic_pin = pentry->irq; + irq_attr.ioapic_pin = irq; irq_attr.trigger =1 ; irq_attr.polarity =1 ; -io_apic_set_pci_routing (NULL , pentry->irq, &irq_attr); - } +io_apic_set_pci_routing (NULL , irq, &irq_attr); + }else + irq =0 ;/* No irq */ +switch (pentry->type) {case SFI_DEV_TYPE_IPC :/* ID as IRQ is a hack that will go away */ - pdev =platform_device_alloc (pentry->name, pentry->irq); + pdev =platform_device_alloc (pentry->name, irq);if (pdev ==NULL ) {pr_err ("out of memory for SFI platform device '%s'.\n" , pentry->name);continue ; } -install_irq_resource (pdev, pentry->irq); +install_irq_resource (pdev, irq);pr_debug ("info[%2d]: IPC bus, name = %16.16s, " -"irq = 0x%2x\n" , i, pentry->name, pentry->irq); +"irq = 0x%2x\n" , i, pentry->name, irq);sfi_handle_ipc_dev (pdev);break ;case SFI_DEV_TYPE_SPI :memset (&spi_info,0 ,sizeof (spi_info));strncpy (spi_info.modalias, pentry->name,SFI_NAME_LEN ); - spi_info.irq = pentry->irq; + spi_info.irq = irq; spi_info.bus_num = pentry->host_num; spi_info.chip_select = pentry->addr; spi_info.max_speed_hz = pentry->max_freq;
@@ -724,7 +728,7 @@ static int __init sfi_parse_devs(struct sfi_table_header *table)memset (&i2c_info,0 ,sizeof (i2c_info)); bus = pentry->host_num;strncpy (i2c_info.type, pentry->name,SFI_NAME_LEN ); - i2c_info.irq = pentry->irq; + i2c_info.irq = irq; i2c_info.addr = pentry->addr; pr_debug("info[%2d]: I2C bus = %d, name = %16.16s, " "irq = 0x%2x, addr = 0x%x\n", i, bus,
arch/x86/xen/enlighten.c +1 -2
@@ -1337,7 +1337,7 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self,int cpu = (long )hcpu;switch (action) {case CPU_UP_PREPARE : -per_cpu (xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu]; +xen_vcpu_setup (cpu);if (xen_have_vector_callback)xen_init_lock_cpu (cpu);break ;
@@ -1367,7 +1367,6 @@ static void __init xen_hvm_guest_init(void)xen_hvm_smp_init ();register_cpu_notifier (&xen_hvm_cpu_notifier);xen_unplug_emulated_devices (); - have_vcpu_info_placement =0 ; x86_init.irqs.intr_init = xen_init_IRQ;xen_hvm_init_time_ops ();xen_hvm_init_mmu_ops ();
block/blk-map.c +4 -3
@@ -204,10 +204,11 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,if (!iov[i].iov_len)return -EINVAL ; -if (uaddr &queue_dma_alignment (q)) { +/* +* Keep going so we check length of all segments +*/ +if (uaddr &queue_dma_alignment (q)) unaligned =1 ; -break ; - } }if (unaligned || (q->dma_pad_mask & len) || map_data)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -865,7 +865,7 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused) MEMSTAT_VID_SHIFT);seq_printf (m,"Current P-state: %d\n" , (rgvstat &MEMSTAT_PSTATE_MASK ) >>MEMSTAT_PSTATE_SHIFT ); - }else if (IS_GEN6 (dev)) { + }else if (IS_GEN6 (dev) ||IS_GEN7 (dev)) {u32 gt_perf_status =I915_READ (GEN6_GT_PERF_STATUS );u32 rp_state_limits =I915_READ (GEN6_RP_STATE_LIMITS );u32 rp_state_cap =I915_READ (GEN6_RP_STATE_CAP );
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -1475,7 +1475,7 @@ i915_gem_mmap_gtt(struct drm_file *file,if (obj->base.size > dev_priv->mm.gtt_mappable_end) { ret = -E2BIG ; - goto unlock; + goto out; }if (obj->madv !=I915_MADV_WILLNEED ) {
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -7943,7 +7943,7 @@ void intel_modeset_init(struct drm_device *dev)intel_init_emon (dev); } -if (IS_GEN6 (dev)) +if (IS_GEN6 (dev) ||IS_GEN7 (dev))gen6_enable_rps (dev_priv);INIT_WORK (&dev_priv->idle_work, intel_idle_update);
@@ -7985,7 +7985,7 @@ void intel_modeset_cleanup(struct drm_device *dev)if (IS_IRONLAKE_M (dev))ironlake_disable_drps (dev); -if (IS_GEN6 (dev)) +if (IS_GEN6 (dev) ||IS_GEN7 (dev))gen6_disable_rps (dev);if (IS_IRONLAKE_M (dev))
drivers/gpu/drm/nouveau/nouveau_channel.c +1 -0
@@ -159,6 +159,7 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret,INIT_LIST_HEAD (&chan->nvsw.vbl_wait);INIT_LIST_HEAD (&chan->nvsw.flip);INIT_LIST_HEAD (&chan->fence.pending); +spin_lock_init (&chan->fence.lock);/* Allocate DMA push buffer */ chan->pushbuf_bo =nouveau_channel_user_pushbuf_alloc (dev);
drivers/gpu/drm/nouveau/nouveau_fence.c +0 -2
@@ -542,8 +542,6 @@ nouveau_fence_channel_init(struct nouveau_channel *chan)return ret; } -INIT_LIST_HEAD (&chan->fence.pending); -spin_lock_init (&chan->fence.lock);atomic_set (&chan->fence.last_sequence_irq,0 );return 0 ; }
drivers/gpu/drm/radeon/atombios_dp.c +1 -1
@@ -283,7 +283,7 @@ int radeon_dp_i2c_aux_ch(struct i2c_adapter *adapter, int mode, } } -DRM_ERROR ("aux i2c too many retries, giving up\n" ); +DRM_DEBUG_KMS ("aux i2c too many retries, giving up\n" );return -EREMOTEIO ; }
drivers/leds/led-class.c +1 -4
@@ -270,11 +270,8 @@ void led_blink_set(struct led_classdev *led_cdev,del_timer_sync (&led_cdev->blink_timer);if (led_cdev->blink_set && - !led_cdev->blink_set (led_cdev, delay_on, delay_off)) { - led_cdev->blink_delay_on = *delay_on; - led_cdev->blink_delay_off = *delay_off; + !led_cdev->blink_set (led_cdev, delay_on, delay_off))return ; - }/* blink with 1 Hz as default if nothing specified */ if (!*delay_on && !*delay_off)
drivers/md/raid5.c +20 -12
@@ -3120,12 +3120,16 @@ static void handle_stripe5(struct stripe_head *sh)/* check if the array has lost two devices and, if so, some requests might * need to be failed */ -if (s.failed >1 && s.to_read+s.to_write+s.written) -handle_failed_stripe (conf, sh, &s, disks, &return_bi); -if (s.failed >1 && s.syncing) { -md_done_sync (conf->mddev,STRIPE_SECTORS ,0 ); -clear_bit (STRIPE_SYNCING , &sh->state); - s.syncing =0 ; +if (s.failed >1 ) { + sh->check_state =0 ; + sh->reconstruct_state =0 ; +if (s.to_read+s.to_write+s.written) +handle_failed_stripe (conf, sh, &s, disks, &return_bi); +if (s.syncing) { +md_done_sync (conf->mddev,STRIPE_SECTORS ,0 ); +clear_bit (STRIPE_SYNCING , &sh->state); + s.syncing =0 ; + } }/* might be able to return some write requests if the parity block
@@ -3412,12 +3416,16 @@ static void handle_stripe6(struct stripe_head *sh)/* check if the array has lost >2 devices and, if so, some requests * might need to be failed */ -if (s.failed >2 && s.to_read+s.to_write+s.written) -handle_failed_stripe (conf, sh, &s, disks, &return_bi); -if (s.failed >2 && s.syncing) { -md_done_sync (conf->mddev,STRIPE_SECTORS ,0 ); -clear_bit (STRIPE_SYNCING , &sh->state); - s.syncing =0 ; +if (s.failed >2 ) { + sh->check_state =0 ; + sh->reconstruct_state =0 ; +if (s.to_read+s.to_write+s.written) +handle_failed_stripe (conf, sh, &s, disks, &return_bi); +if (s.syncing) { +md_done_sync (conf->mddev,STRIPE_SECTORS ,0 ); +clear_bit (STRIPE_SYNCING , &sh->state); + s.syncing =0 ; + } }/*
drivers/mfd/twl-core.c +1 -1
@@ -109,7 +109,7 @@#define twl_has_watchdog () false#endif -#if defined(CONFIG_TWL4030_CODEC ) || defined(CONFIG_TWL4030_CODEC_MODULE ) ||\ +#if defined(CONFIG_MFD_TWL4030_AUDIO ) || defined(CONFIG_MFD_TWL4030_AUDIO_MODULE ) ||\ defined(CONFIG_SND_SOC_TWL6040 ) || defined(CONFIG_SND_SOC_TWL6040_MODULE )#define twl_has_codec () true#else
drivers/net/wireless/b43/main.c +7 -0
@@ -2401,6 +2401,13 @@ static int b43_upload_microcode(struct b43_wldev *dev)b43_print_fw_helptext (dev->wl,1 ); err = -EOPNOTSUPP ; goto error; + }else if (fwrev >=598 ) { +b43err (dev->wl,"YOUR FIRMWARE IS TOO NEW. Support for " +"firmware 598 and up requires kernel 3.2 or newer. You " +"have to install older firmware or upgrade kernel.\n" ); +b43_print_fw_helptext (dev->wl,1 ); + err = -EOPNOTSUPP ; + goto error; } dev->fw.rev = fwrev; dev->fw.patch = fwpatch;
drivers/virtio/virtio_pci.c +6 -5
@@ -590,11 +590,11 @@ static struct virtio_config_ops virtio_pci_config_ops = {static void virtio_pci_release_dev (struct device *_d) { - struct virtio_device *dev = container_of(_d, struct virtio_device, - dev); -struct virtio_pci_device *vp_dev =to_vp_device (dev); - -kfree (vp_dev); +/* +* No need for a release method as we allocate/free +* all devices together with the pci devices. +* Provide an empty one to avoid getting a warning from core. +*/ }/* the PCI probing function */
@@ -682,6 +682,7 @@ static void __devexit virtio_pci_remove(struct pci_dev *pci_dev)pci_iounmap (pci_dev, vp_dev->ioaddr);pci_release_regions (pci_dev);pci_disable_device (pci_dev); +kfree (vp_dev); }#ifdef CONFIG_PM
drivers/xen/gntalloc.c +2 -2
@@ -135,7 +135,7 @@ static int add_grefs(struct ioctl_gntalloc_alloc_gref *op,/* Grant foreign access to the page. */ gref->gref_id =gnttab_grant_foreign_access (op->domid,pfn_to_mfn (page_to_pfn (gref->page)), readonly); -if (gref->gref_id <0 ) { +if ((int )gref->gref_id <0 ) { rc = gref->gref_id; goto undo; }
@@ -280,7 +280,7 @@ static long gntalloc_ioctl_alloc(struct gntalloc_file_private_data *priv, goto out; } - gref_ids =kzalloc (sizeof (gref_ids[0 ]) * op.count,GFP_TEMPORARY ); + gref_ids =kcalloc (op.count,sizeof (gref_ids[0 ]),GFP_TEMPORARY );if (!gref_ids) { rc = -ENOMEM ; goto out;
fs/hfs/trans.c +2 -0
@@ -40,6 +40,8 @@ int hfs_mac2asc(struct super_block *sb, char *out, const struct hfs_name *in) src = in->name; srclen = in->len; +if (srclen >HFS_NAMELEN ) + srclen =HFS_NAMELEN ; dst = out; dstlen =HFS_MAX_NAMELEN ;if (nls_io) {
include/drm/drm_pciids.h +2 -0
@@ -4,6 +4,7 @@*/ #define radeon_PCI_IDS \ {0x1002, 0x3150, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \ + {0x1002, 0x3151, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x3152, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x3154, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x3155, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
@@ -55,6 +56,7 @@ {0x1002, 0x4C64, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV250|RADEON_IS_MOBILITY}, \ {0x1002, 0x4C66, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV250|RADEON_IS_MOBILITY}, \ {0x1002, 0x4C67, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV250|RADEON_IS_MOBILITY}, \ + {0x1002, 0x4C6E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280|RADEON_IS_MOBILITY}, \ {0x1002, 0x4E44, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ {0x1002, 0x4E45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ {0x1002, 0x4E46, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
mm/backing-dev.c +8 -0
@@ -686,6 +686,14 @@ void bdi_destroy(struct backing_dev_info *bdi)bdi_unregister (bdi); +/* +* If bdi_unregister() had already been called earlier, the +* wakeup_timer could still be armed because bdi_prune_sb() +* can race with the bdi_wakeup_thread_delayed() calls from +* __mark_inode_dirty(). +*/ +del_timer_sync (&bdi->wb.wakeup_timer); +for (i =0 ; i <NR_BDI_STAT_ITEMS ; i++)percpu_counter_destroy (&bdi->bdi_stat[i]);
security/keys/user_defined.c +2 -1
@@ -102,7 +102,8 @@ int user_update(struct key *key, const void *data, size_t datalen) key->expiry =0 ; } -kfree_rcu (zap, rcu); +if (zap) +kfree_rcu (zap, rcu); error:return ret;
sound/pci/hda/hda_codec.c +39 -21
80 lines not on this page · raw message
sound/soc/codecs/wm8994.c +1 -1
@@ -56,7 +56,7 @@ static int wm8994_retune_mobile_base[] = {static int wm8994_readable (struct snd_soc_codec *codec,unsigned int reg) {struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec); -struct wm8994 *control = wm8994->control_data; +struct wm8994 *control = codec->control_data;switch (reg) {case WM8994_GPIO_1 :
sound/usb/mixer.c +69 -51
165 lines not on this page · raw message