Linux 3.4.61
Greg KH
maintainerI'm announcing the release of the 3.4.61 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 arch/powerpc/Kconfig | 1 arch/powerpc/include/asm/page.h | 10 ++++ drivers/acpi/ec.c | 4 + drivers/base/memory.c | 2 drivers/base/regmap/regmap.c | 2 drivers/gpu/drm/i915/i915_reg.h | 2 drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 58 +++++++++++++++++--------- drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 10 ++++ drivers/net/wireless/iwlegacy/4965-mac.c | 2 drivers/target/target_core_cdb.c | 9 ++-- drivers/tty/hvc/hvsi_lib.c | 4 - fs/bio.c | 20 ++++++-- fs/jfs/jfs_dtree.c | 31 ++++++++++--- net/sunrpc/xdr.c | 9 ++-- sound/isa/opti9xx/opti92x-ad1848.c | 8 --- 16 files changed, 124 insertions(+), 50 deletions(-)
Dave Kleikamp (1):
jfs: fix readdir cookie incompatibility with NFSv4
Eugene Surovegin (1):
powerpc/hvsi: Increase handshake timeout from 200ms to 400ms.
Greg Kroah-Hartman (1):
Linux 3.4.61
Helmut Schaa (1):
ath9k_htc: Restore skb headroom when returning skb to mac80211
Imre Deak (1):
drm/i915: ivb: fix edp voltage swing reg val
Jakob Bornecrantz (1):
drm/vmwgfx: Split GMR2_REMAP commands if they are to large
Lan Tianyu (1):
ACPI / EC: Add ASUSTEK L4R to quirk list in order to validate ECDT
Nicholas Bellinger (1):
target: Fix trailing ASCII space usage in INQUIRY vendor+model
Paul Bolle (1):
regmap: silence GCC warning
Paul Mackerras (1):
powerpc: Work around gcc miscompilation of __pa() on 64-bit
Roland Dreier (1):
SCSI: sg: Fix user memory corruption when SG_IO is interrupted by a signal
Russ Anderson (1):
drivers/base/memory.c: fix show_mem_removable() to handle missing sections
Stanislaw Gruszka (1):
iwl4965: fix rfkill set state regression
Takashi Iwai (1):
ALSA: opti9xx: Fix conflicting driver object name
Trond Myklebust (1):
SUNRPC: Fix memory corruption issue on 32-bit highmem systems
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 60 +SUBLEVEL = 61 EXTRAVERSION = NAME = Saber-toothed Squirrel
arch/powerpc/Kconfig +1 -0
@@ -979,6 +979,7 @@ config RELOCATABLE must live at a different physical address than the primary kernel. +# This value must have zeroes in the bottom 60 bits otherwise lots will break config PAGE_OFFSET hex default "0xc000000000000000"
arch/powerpc/include/asm/page.h +10 -0
@@ -211,9 +211,19 @@ extern long long virt_phys_offset;#define __va (x) ((void *)(unsigned long)((phys_addr_t)(x) + VIRT_PHYS_OFFSET))#define __pa (x) ((unsigned long)(x) - VIRT_PHYS_OFFSET)#else +#ifdef CONFIG_PPC64 +/* +* gcc miscompiles (unsigned long)(&static_var) - PAGE_OFFSET +* with -mcmodel=medium, so we use & and | instead of - and + on 64-bit. +*/ +#define __va (x) ((void *)(unsigned long)((phys_addr_t)(x) | PAGE_OFFSET)) +#define __pa (x) ((unsigned long)(x) & 0x0fffffffffffffffUL) + +#else /* 32-bit, non book E */ #define __va (x) ((void *)(unsigned long)((phys_addr_t)(x) + PAGE_OFFSET - MEMORY_START))#define __pa (x) ((unsigned long)(x) - PAGE_OFFSET + MEMORY_START)#endif +#endif /* * Unfortunately the PLT is in the BSS in the PPC32 ELF ABI,
drivers/acpi/ec.c +4 -0
@@ -978,6 +978,10 @@ static struct dmi_system_id __initdata ec_dmi_table[] = { ec_skip_dsdt_scan, "HP Folio 13", {DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), DMI_MATCH(DMI_PRODUCT_NAME, "HP Folio 13"),}, NULL}, + { + ec_validate_ecdt, "ASUS hardware", { +DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTek Computer Inc." ), + DMI_MATCH(DMI_PRODUCT_NAME, "L4R"),}, NULL}, {}, };
drivers/base/memory.c +2 -0
@@ -154,6 +154,8 @@ static ssize_t show_mem_removable(struct device *dev, container_of(dev, struct memory_block, dev);for (i =0 ; i < sections_per_block; i++) { +if (!present_section_nr (mem->start_section_nr + i)) +continue ; pfn =section_nr_to_pfn (mem->start_section_nr + i); ret &=is_mem_section_removable (pfn,PAGES_PER_SECTION ); }
drivers/base/regmap/regmap.c +1 -1
@@ -69,7 +69,7 @@ bool regmap_precious(struct regmap *map, unsigned int reg) }static bool regmap_volatile_range (struct regmap *map,unsigned int reg, -unsigned int num) +size_t num) {unsigned int i;
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -3741,7 +3741,7 @@#define EDP_LINK_TRAIN_600MV_0DB_IVB (0x30 <<22)#define EDP_LINK_TRAIN_600MV_3_5DB_IVB (0x36 <<22)#define EDP_LINK_TRAIN_800MV_0DB_IVB (0x38 <<22) -#define EDP_LINK_TRAIN_800MV_3_5DB_IVB (0x33 <<22) +#define EDP_LINK_TRAIN_800MV_3_5DB_IVB (0x3e <<22)/* legacy values */ #define EDP_LINK_TRAIN_500MV_0DB_IVB (0x00 <<22)
drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c +39 -19
89 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +10 -0
@@ -448,6 +448,7 @@ static void ath9k_htc_tx_process(struct ath9k_htc_priv *priv,struct ieee80211_conf *cur_conf = &priv->hw->conf;bool txok;int slot; +int hdrlen, padsize; slot =strip_drv_header (priv, skb);if (slot <0 ) {
@@ -504,6 +505,15 @@ send_mac80211:ath9k_htc_tx_clear_slot (priv, slot); +/* Remove padding before handing frame back to mac80211 */ + hdrlen =ieee80211_get_hdrlen_from_skb (skb); + + padsize = hdrlen &3 ; +if (padsize && skb->len > hdrlen + padsize) { +memmove (skb->data + padsize, skb->data, hdrlen); +skb_pull (skb, padsize); + } +/* Send status to mac80211 */ ieee80211_tx_status (priv->hw, skb); }
drivers/net/wireless/iwlegacy/4965-mac.c +1 -1
@@ -4415,9 +4415,9 @@ il4965_irq_tasklet(struct il_priv *il)set_bit (S_RFKILL , &il->status); }else {clear_bit (S_RFKILL , &il->status); -wiphy_rfkill_set_hw_state (il->hw->wiphy, hw_rf_kill);il_force_reset (il, true); } +wiphy_rfkill_set_hw_state (il->hw->wiphy, hw_rf_kill); handled |=CSR_INT_BIT_RF_KILL ; }
drivers/target/target_core_cdb.c +6 -3
@@ -97,9 +97,12 @@ target_emulate_inquiry_std(struct se_cmd *cmd, char *buf) buf[7 ] =0x2 ;/* CmdQue=1 */ -snprintf (&buf[8 ],8 ,"LIO-ORG" ); -snprintf (&buf[16 ],16 ,"%s" , dev->se_sub_dev->t10_wwn.model); -snprintf (&buf[32 ],4 ,"%s" , dev->se_sub_dev->t10_wwn.revision); +memcpy (&buf[8 ],"LIO-ORG " ,8 ); +memset (&buf[16 ],0x20 ,16 ); +memcpy (&buf[16 ], dev->se_sub_dev->t10_wwn.model, +min_t (size_t,strlen (dev->se_sub_dev->t10_wwn.model),16 )); +memcpy (&buf[32 ], dev->se_sub_dev->t10_wwn.revision, +min_t (size_t,strlen (dev->se_sub_dev->t10_wwn.revision),4 )); buf[4 ] =31 ;/* Set additional length to 31 */ return 0 ;
drivers/tty/hvc/hvsi_lib.c +2 -2
@@ -341,8 +341,8 @@ void hvsilib_establish(struct hvsi_priv *pv)pr_devel ("HVSI@%x: ... waiting handshake\n" , pv->termno); -/* Try for up to 200s */ -for (timeout =0 ; timeout <20 ; timeout++) { +/* Try for up to 400ms */ +for (timeout =0 ; timeout <40 ; timeout++) {if (pv->established) goto established;if (!hvsi_get_packet (pv))
fs/bio.c +15 -5
@@ -787,12 +787,22 @@ static int __bio_copy_iov(struct bio *bio, struct bio_vec *iovecs,int bio_uncopy_user (struct bio *bio) {struct bio_map_data *bmd = bio->bi_private; -int ret =0 ; +struct bio_vec *bvec; +int ret =0 , i; -if (!bio_flagged (bio,BIO_NULL_MAPPED )) - ret =__bio_copy_iov (bio, bmd->iovecs, bmd->sgvecs, - bmd->nr_sgvecs,bio_data_dir (bio) ==READ , -0 , bmd->is_our_pages); +if (!bio_flagged (bio,BIO_NULL_MAPPED )) { +/* +* if we're in a workqueue, the request is orphaned, so +* don't copy into a random user address space, just free. +*/ +if (current->mm) + ret =__bio_copy_iov (bio, bmd->iovecs, bmd->sgvecs, + bmd->nr_sgvecs,bio_data_dir (bio) ==READ , +0 , bmd->is_our_pages); +else if (bmd->is_our_pages) +__bio_for_each_segment (bvec, bio, i,0 ) +__free_page (bvec->bv_page); + }bio_free_map_data (bmd);bio_put (bio);return ret;
fs/jfs/jfs_dtree.c +23 -8
@@ -3047,6 +3047,14 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir) dir_index = (u32 ) filp->f_pos; +/* +* NFSv4 reserves cookies 1 and 2 for . and .. so we add +* the value we return to the vfs is one greater than the +* one we use internally. +*/ +if (dir_index) + dir_index--; +if (dir_index >1 ) {struct dir_table_slot dirtab_slot;
@@ -3086,7 +3094,7 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir)if (p->header.flag &BT_INTERNAL ) {jfs_err ("jfs_readdir: bad index table" );DT_PUTPAGE (mp); - filp->f_pos =-1 ; + filp->f_pos =DIREND ;return 0 ; } }else {
@@ -3094,7 +3102,7 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir)/* * self "." */ - filp->f_pos =0 ; + filp->f_pos =1 ;if (filldir (dirent,"." ,1 ,0 , ip->i_ino,DT_DIR ))return 0 ;
@@ -3102,7 +3110,7 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir)/* * parent ".." */ - filp->f_pos =1 ; + filp->f_pos =2 ;if (filldir (dirent,".." ,2 ,1 ,PARENT (ip),DT_DIR ))return 0 ;
@@ -3123,24 +3131,25 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir)/* * Legacy filesystem - OS/2 & Linux JFS < 0.3.6 * -* pn = index = 0: First entry "." -* pn = 0; index = 1: Second entry ".." +* pn = 0; index = 1: First entry "." +* pn = 0; index = 2: Second entry ".." * pn > 0: Real entries, pn=1 -> leftmost page * pn = index = -1: No more entries */ dtpos = filp->f_pos; -if (dtpos ==0 ) { +if (dtpos <2 ) {/* build "." entry */ + filp->f_pos =1 ;if (filldir (dirent,"." ,1 , filp->f_pos, ip->i_ino,DT_DIR ))return 0 ; - dtoffset->index =1 ; + dtoffset->index =2 ; filp->f_pos = dtpos; }if (dtoffset->pn ==0 ) { -if (dtoffset->index ==1 ) { +if (dtoffset->index ==2 ) {/* build ".." entry */ if (filldir(dirent, "..", 2, filp->f_pos,
@@ -3233,6 +3242,12 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir) } jfs_dirent->position = unique_pos++; } +/* +* We add 1 to the index because we may +* use a value of 2 internally, and NFSv4 +* doesn't like that. +*/ + jfs_dirent->position++; }else { jfs_dirent->position = dtpos; len =min (d_namleft,DTLHDRDATALEN_LEGACY );
net/sunrpc/xdr.c +6 -3
@@ -233,10 +233,13 @@ _shift_data_right_pages(struct page **pages, size_t pgto_base, pgfrom_base -= copy; vto =kmap_atomic (*pgto); - vfrom =kmap_atomic (*pgfrom); -memmove (vto + pgto_base, vfrom + pgfrom_base, copy); +if (*pgto != *pgfrom) { + vfrom =kmap_atomic (*pgfrom); +memcpy (vto + pgto_base, vfrom + pgfrom_base, copy); +kunmap_atomic (vfrom); + }else +memmove (vto + pgto_base, vto + pgfrom_base, copy);flush_dcache_page (*pgto); -kunmap_atomic (vfrom);kunmap_atomic (vto); }while ((len -= copy) !=0 );
sound/isa/opti9xx/opti92x-ad1848.c +2 -6
@@ -173,11 +173,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_opti9xx_pnpids);#endif /* CONFIG_PNP */ -#ifdef OPTi93X -#define DEV_NAME "opti93x" -#else -#define DEV_NAME "opti92x" -#endif +#define DEV_NAME KBUILD_MODNAMEstatic char * snd_opti9xx_names[] = {"unknown" ,
@@ -1126,7 +1122,7 @@ static void __devexit snd_opti9xx_pnp_remove(struct pnp_card_link * pcard)static struct pnp_card_driver opti9xx_pnpc_driver = { .flags =PNP_DRIVER_RES_DISABLE , - .name ="opti9xx" , + .name =DEV_NAME , .id_table = snd_opti9xx_pnpids, .probe = snd_opti9xx_pnp_probe, .remove =__devexit_p (snd_opti9xx_pnp_remove),