Linux 3.4.47
Greg KH
maintainerI'm announcing the release of the 3.4.47 kernel.
All users of the 3.4 kernel series must upgrade.
The updated 3.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.4.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 +- drivers/gpu/drm/radeon/evergreen.c | 4 ++-- drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- drivers/gpu/drm/radeon/si.c | 4 ++-- drivers/hwmon/abituguru.c | 16 ++++++++++------ drivers/i2c/busses/i2c-designware-core.c | 3 ++- drivers/media/dvb/mantis/mantis_dvb.c | 6 ++++-- fs/btrfs/ioctl.c | 10 +++++----- 8 files changed, 27 insertions(+), 20 deletions(-)
Alan Cox (1):
media: mantis: fix silly crash case
Gabriel de Perthuis (1):
btrfs: don't stop searching after encountering the wrong item
Greg Kroah-Hartman (1):
Linux 3.4.47
Mika Westerberg (1):
i2c: designware: always clear interrupts before enabling them
Niels Ole Salscheider (1):
drm/radeon: Fix VRAM size calculation for VRAM >= 4GB
Wei Yongjun (1):
hwmon: fix error return code in abituguru_probe()
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 46 +SUBLEVEL = 47 EXTRAVERSION = NAME = Saber-toothed Squirrel
drivers/gpu/drm/radeon/evergreen.c +2 -2
@@ -2443,8 +2443,8 @@ int evergreen_mc_init(struct radeon_device *rdev) rdev->mc.real_vram_size =RREG32 (CONFIG_MEMSIZE ); }else {/* size in MB on evergreen/cayman/tn */ - rdev->mc.mc_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024 *1024 ; - rdev->mc.real_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024 *1024 ; + rdev->mc.mc_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024ULL *1024ULL ; + rdev->mc.real_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024ULL *1024ULL ; } rdev->mc.visible_vram_size = rdev->mc.aper_size;r700_vram_gtt_location (rdev, &rdev->mc);
drivers/gpu/drm/radeon/radeon_ttm.c +1 -1
@@ -744,7 +744,7 @@ int radeon_ttm_init(struct radeon_device *rdev)return r; }DRM_INFO ("radeon: %uM of VRAM memory ready\n" , - (unsigned )rdev->mc.real_vram_size / (1024 *1024 )); + (unsigned ) (rdev->mc.real_vram_size / (1024 *1024 ))); r =ttm_bo_init_mm (&rdev->mman.bdev,TTM_PL_TT , rdev->mc.gtt_size >>PAGE_SHIFT );if (r) {
drivers/gpu/drm/radeon/si.c +2 -2
@@ -2464,8 +2464,8 @@ static int si_mc_init(struct radeon_device *rdev) rdev->mc.aper_base =pci_resource_start (rdev->pdev,0 ); rdev->mc.aper_size =pci_resource_len (rdev->pdev,0 );/* size in MB on si */ - rdev->mc.mc_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024 *1024 ; - rdev->mc.real_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024 *1024 ; + rdev->mc.mc_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024ULL *1024ULL ; + rdev->mc.real_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024ULL *1024ULL ; rdev->mc.visible_vram_size = rdev->mc.aper_size;si_vram_gtt_location (rdev, &rdev->mc);radeon_update_bandwidth_info (rdev);
drivers/hwmon/abituguru.c +10 -6
@@ -1410,14 +1410,18 @@ static int __devinit abituguru_probe(struct platform_device *pdev)pr_info ("found Abit uGuru\n" );/* Register sysfs hooks */ -for (i =0 ; i < sysfs_attr_i; i++) -if (device_create_file (&pdev->dev, - &data->sysfs_attr[i].dev_attr)) +for (i =0 ; i < sysfs_attr_i; i++) { + res =device_create_file (&pdev->dev, + &data->sysfs_attr[i].dev_attr); +if (res) goto abituguru_probe_error; -for (i =0 ; i <ARRAY_SIZE (abituguru_sysfs_attr); i++) -if (device_create_file (&pdev->dev, - &abituguru_sysfs_attr[i].dev_attr)) + } +for (i =0 ; i <ARRAY_SIZE (abituguru_sysfs_attr); i++) { + res =device_create_file (&pdev->dev, + &abituguru_sysfs_attr[i].dev_attr); +if (res) goto abituguru_probe_error; + } data->hwmon_dev =hwmon_device_register (&pdev->dev);if (!IS_ERR (data->hwmon_dev))
drivers/i2c/busses/i2c-designware-core.c +2 -1
@@ -349,7 +349,8 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev)/* Enable the adapter */ dw_writel (dev,1 ,DW_IC_ENABLE ); -/* Enable interrupts */ +/* Clear and enable interrupts */ +i2c_dw_clear_int (dev);dw_writel (dev,DW_IC_INTR_DEFAULT_MASK ,DW_IC_INTR_MASK ); }
drivers/media/dvb/mantis/mantis_dvb.c +4 -2
@@ -248,8 +248,10 @@ int __devinit mantis_dvb_init(struct mantis_pci *mantis) err5:tasklet_kill (&mantis->tasklet);dvb_net_release (&mantis->dvbnet); -dvb_unregister_frontend (mantis->fe); -dvb_frontend_detach (mantis->fe); +if (mantis->fe) { +dvb_unregister_frontend (mantis->fe); +dvb_frontend_detach (mantis->fe); + } err4: mantis->demux.dmx.remove_frontend (&mantis->demux.dmx, &mantis->fe_mem);
fs/btrfs/ioctl.c +5 -5
@@ -1653,7 +1653,11 @@ static noinline int copy_to_sk(struct btrfs_root *root, item_off =btrfs_item_ptr_offset (leaf, i); item_len =btrfs_item_size_nr (leaf, i); -if (item_len >BTRFS_SEARCH_ARGS_BUFSIZE ) +btrfs_item_key_to_cpu (leaf, key, i); +if (!key_in_sk (key, sk)) +continue ; + +if (sizeof (sh) + item_len >BTRFS_SEARCH_ARGS_BUFSIZE ) item_len =0 ; if (sizeof(sh) + item_len + *sk_offset >
@@ -1662,10 +1666,6 @@ static noinline int copy_to_sk(struct btrfs_root *root, goto overflow; } -btrfs_item_key_to_cpu (leaf, key, i); -if (!key_in_sk (key, sk)) -continue ; - sh.objectid = key->objectid; sh.offset = key->offset; sh.type = key->type;