Linux 3.4.85
Greg KH
maintainerI'm announcing the release of the 3.4.85 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/arm/include/asm/outercache.h | 4 +- arch/x86/kvm/mmu.c | 3 + arch/x86/kvm/vmx.c | 2 - arch/x86/net/bpf_jit.S | 2 - drivers/edac/i7300_edac.c | 38 ++++++++++--------- drivers/input/mouse/elantech.c | 45 +++++++++++++++++++++-- drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 7 ++- drivers/net/wireless/p54/txrx.c | 2 - drivers/usb/host/xhci-pci.c | 5 ++ ipc/msg.c | 2 + net/ceph/osd_client.c | 28 +++++++++++--- scripts/package/builddeb | 9 ++-- sound/core/compress_offload.c | 2 - 14 files changed, 109 insertions(+), 42 deletions(-)
Alexei Starovoitov (1):
x86: bpf_jit: support negative offsets
Ben Hutchings (2):
iwlwifi: Complete backport of "iwlwifi: always copy first 16 bytes of commands"
deb-pkg: Fix cross-building linux-headers package
Charles Keepax (1):
ALSA: compress: Pass through return value of open ops callback
Dan Carpenter (1):
p54: clamp properly instead of just truncating
Greg Kroah-Hartman (1):
Linux 3.4.85
Hans de Goede (1):
Input: elantech - improve clickpad detection
Jean Delvare (1):
i7300_edac: Fix device reference count
Josh Durgin (1):
libceph: resend all writes after the osdmap loses the full flag
Konstantin Khlebnikov (1):
ipc/msg: fix race around refcount
Marcelo Tosatti (2):
KVM: MMU: handle invalid root_hpa at __direct_map
KVM: VMX: fix use after free of vmx->loaded_vmcs
Rob Herring (1):
ARM: move outer_cache declaration out of ifdef
Sarah Sharp (1):
xhci: Fix resume issues on Renesas chips in Samsung laptops
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 84 +SUBLEVEL = 85 EXTRAVERSION = NAME = Saber-toothed Squirrel
arch/arm/include/asm/outercache.h +2 -2
@@ -37,10 +37,10 @@ struct outer_cache_fns {void (*resume)(void ); }; -#ifdef CONFIG_OUTER_CACHE -extern struct outer_cache_fns outer_cache; +#ifdef CONFIG_OUTER_CACHE +static inline void outer_inv_range (phys_addr_t start,phys_addr_t end) {if (outer_cache.inv_range)
arch/x86/kvm/mmu.c +3 -0
@@ -2451,6 +2451,9 @@ static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write,int emulate =0 ;gfn_t pseudo_gfn; +if (!VALID_PAGE (vcpu->arch.mmu.root_hpa)) +return 0 ; +for_each_shadow_entry (vcpu, (u64 )gfn <<PAGE_SHIFT , iterator) {if (iterator.level == level) {unsigned pte_access =ACC_ALL ;
arch/x86/kvm/vmx.c +1 -1
@@ -6281,8 +6281,8 @@ static void vmx_free_vcpu(struct kvm_vcpu *vcpu)struct vcpu_vmx *vmx =to_vmx (vcpu);free_vpid (vmx); -free_nested (vmx);free_loaded_vmcs (vmx->loaded_vmcs); +free_nested (vmx);kfree (vmx->guest_msrs);kvm_vcpu_uninit (vcpu);kmem_cache_free (kvm_vcpu_cache, vmx);
arch/x86/net/bpf_jit.S +1 -1
@@ -140,7 +140,7 @@ bpf_slow_path_byte_msh: push %r9; \ push SKBDATA; \ /* rsi already has offset */ \ - mov $SIZE,%ecx; /* size */ \ + mov $SIZE,%edx; /* size */ \ call bpf_internal_load_pointer_neg_helper; \ test %rax,%rax; \ pop SKBDATA; \
drivers/edac/i7300_edac.c +20 -18
@@ -962,33 +962,35 @@ static int __devinit i7300_get_devices(struct mem_ctl_info *mci)/* Attempt to 'get' the MCH register we want */ pdev =NULL ; -while (!pvt->pci_dev_16_1_fsb_addr_map || - !pvt->pci_dev_16_2_fsb_err_regs) { - pdev =pci_get_device (PCI_VENDOR_ID_INTEL , -PCI_DEVICE_ID_INTEL_I7300_MCH_ERR , pdev); -if (!pdev) { -/* End of list, leave */ -i7300_printk (KERN_ERR , -"'system address,Process Bus' " -"device not found:" -"vendor 0x%x device 0x%x ERR funcs " -"(broken BIOS?)\n" , -PCI_VENDOR_ID_INTEL , -PCI_DEVICE_ID_INTEL_I7300_MCH_ERR ); - goto error; - } - +while ((pdev =pci_get_device (PCI_VENDOR_ID_INTEL , +PCI_DEVICE_ID_INTEL_I7300_MCH_ERR , + pdev))) {/* Store device 16 funcs 1 and 2 */ switch (PCI_FUNC (pdev->devfn)) {case 1 : - pvt->pci_dev_16_1_fsb_addr_map = pdev; +if (!pvt->pci_dev_16_1_fsb_addr_map) + pvt->pci_dev_16_1_fsb_addr_map = +pci_dev_get (pdev);break ;case 2 : - pvt->pci_dev_16_2_fsb_err_regs = pdev; +if (!pvt->pci_dev_16_2_fsb_err_regs) + pvt->pci_dev_16_2_fsb_err_regs = +pci_dev_get (pdev);break ; } } +if (!pvt->pci_dev_16_1_fsb_addr_map || + !pvt->pci_dev_16_2_fsb_err_regs) { +/* At least one device was not found */ +i7300_printk (KERN_ERR , +"'system address,Process Bus' device not found:" +"vendor 0x%x device 0x%x ERR funcs (broken BIOS?)\n" , +PCI_VENDOR_ID_INTEL , +PCI_DEVICE_ID_INTEL_I7300_MCH_ERR ); + goto error; + } + debugf1("System Address, processor bus- PCI Bus ID: %s %x:%x\n", pci_name(pvt->pci_dev_16_0_fsb_ctlr), pvt->pci_dev_16_0_fsb_ctlr->vendor,
drivers/input/mouse/elantech.c +42 -3
69 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c +4 -3
@@ -825,14 +825,15 @@ static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd) trace_idx =1 ;#endif +/* map the remaining (adjusted) nocopy/dup fragments */ for (i =0 ; i <IWL_MAX_CMD_TFDS ; i++) { -if (!cmd->len[i]) +if (!cmdlen[i])continue ;if (!(cmd->dataflags[i] &IWL_HCMD_DFL_NOCOPY ))continue ; phys_addr =dma_map_single (trans->dev, - (void *)cmd->data[i], - cmd->len[i],DMA_BIDIRECTIONAL ); + (void *)cmddata[i], + cmdlen[i],DMA_BIDIRECTIONAL );if (dma_mapping_error (trans->dev, phys_addr)) { iwlagn_unmap_tfd(trans, out_meta, &txq->tfds[q->write_ptr],
drivers/net/wireless/p54/txrx.c +1 -1
@@ -583,7 +583,7 @@ static void p54_rx_stats(struct p54_common *priv, struct sk_buff *skb) chan = priv->curchan;if (chan) {struct survey_info *survey = &priv->survey[chan->hw_value]; - survey->noise =clamp_t (s8, priv->noise,-128 ,127 ); + survey->noise =clamp (priv->noise,-128 ,127 ); survey->channel_time = priv->survey_raw.active; survey->channel_time_tx = priv->survey_raw.tx; survey->channel_time_busy = priv->survey_raw.tx +
drivers/usb/host/xhci-pci.c +5 -0
@@ -109,6 +109,11 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)xhci_dbg (xhci,"QUIRK: Resetting on resume\n" ); xhci->quirks |=XHCI_TRUST_TX_LENGTH ; } +if (pdev->vendor ==PCI_VENDOR_ID_RENESAS && + pdev->device ==0x0015 && + pdev->subsystem_vendor ==PCI_VENDOR_ID_SAMSUNG && + pdev->subsystem_device ==0xc0cd ) + xhci->quirks |=XHCI_RESET_ON_RESUME ;if (pdev->vendor ==PCI_VENDOR_ID_VIA ) xhci->quirks |=XHCI_RESET_ON_RESUME ; }
ipc/msg.c +2 -0
@@ -296,7 +296,9 @@ static void freeque(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp) }atomic_sub (msq->q_cbytes, &ns->msg_bytes);security_msg_queue_free (msq); +ipc_lock_by_ptr (&msq->q_perm);ipc_rcu_putref (msq); +ipc_unlock (&msq->q_perm); }/*
net/ceph/osd_client.c +22 -6
@@ -1269,14 +1269,17 @@ static void reset_changed_osds(struct ceph_osd_client *osdc)* * Caller should hold map_sem for read. */ -static void kick_requests (struct ceph_osd_client *osdc,int force_resend) +static void kick_requests (struct ceph_osd_client *osdc,bool force_resend, +bool force_resend_writes) {struct ceph_osd_request *req, *nreq;struct rb_node *p;int needmap =0 ;int err; +bool force_resend_req; -dout ("kick_requests %s\n" , force_resend ?" (force resend)" :"" ); +dout ("kick_requests %s %s\n" , force_resend ?" (force resend)" :"" , + force_resend_writes ?" (force resend writes)" :"" );mutex_lock (&osdc->request_mutex);for (p =rb_first (&osdc->requests); p; ) { req = rb_entry(p, struct ceph_osd_request, r_node);
@@ -1299,7 +1302,10 @@ static void kick_requests(struct ceph_osd_client *osdc, int force_resend)continue ; } - err =__map_request (osdc, req, force_resend); + force_resend_req = force_resend || + (force_resend_writes && + req->r_flags &CEPH_OSD_FLAG_WRITE ); + err =__map_request (osdc, req, force_resend_req);if (err <0 )continue ;/* error */ if (req->r_osd ==NULL ) {
@@ -1319,7 +1325,8 @@ static void kick_requests(struct ceph_osd_client *osdc, int force_resend) r_linger_item) {dout ("linger req=%p req->r_osd=%p\n" , req, req->r_osd); - err =__map_request (osdc, req, force_resend); + err =__map_request (osdc, req, + force_resend || force_resend_writes);dout ("__map_request returned %d\n" , err);if (err ==0 )continue ;/* no change and no osd was specified */
@@ -1361,6 +1368,7 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg)struct ceph_osdmap *newmap =NULL , *oldmap;int err;struct ceph_fsid fsid; +bool was_full;dout ("handle_map have %u\n" , osdc->osdmap ? osdc->osdmap->epoch :0 ); p = msg->front.iov_base;
@@ -1374,6 +1382,8 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg)down_write (&osdc->map_sem); + was_full =ceph_osdmap_flag (osdc->osdmap,CEPH_OSDMAP_FULL ); +/* incremental maps */ ceph_decode_32_safe (&p, end, nr_maps, bad);dout (" %d inc maps\n" , nr_maps);
@@ -1398,7 +1408,10 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg)ceph_osdmap_destroy (osdc->osdmap); osdc->osdmap = newmap; } -kick_requests (osdc,0 ); + was_full = was_full || +ceph_osdmap_flag (osdc->osdmap, +CEPH_OSDMAP_FULL ); +kick_requests (osdc,0 , was_full); }else {dout ("ignoring incremental map %u len %d\n" , epoch, maplen);
@@ -1441,7 +1454,10 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg) skipped_map =1 ;ceph_osdmap_destroy (oldmap); } -kick_requests (osdc, skipped_map); + was_full = was_full || +ceph_osdmap_flag (osdc->osdmap, +CEPH_OSDMAP_FULL ); +kick_requests (osdc, skipped_map, was_full); } p += maplen; nr_maps--;
scripts/package/builddeb +4 -5
@@ -62,7 +62,7 @@ create_package() { fi # Create the package - dpkg-gencontrol -isp $forcearch -p$pname -P"$pdir" + dpkg-gencontrol -isp $forcearch -Vkernel:debarch="${debarch:-$(dpkg --print-architecture)}" -p$pname -P"$pdir" dpkg --build "$pdir" .. }
@@ -252,15 +252,14 @@ mkdir -p "$destdir" (cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -) ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build" rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles" -arch=$(dpkg --print-architecture) cat <<EOF >> debian/control Package: $kernel_headers_packagename Provides: linux-headers, linux-headers-2.6 -Architecture: $arch -Description: Linux kernel headers for $KERNELRELEASE on $arch - This package provides kernel header files for $KERNELRELEASE on $arch +Architecture: any +Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch} + This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch} . This is useful for people who need to build external modules EOF
sound/core/compress_offload.c +1 -1
@@ -133,7 +133,7 @@ static int snd_compr_open(struct inode *inode, struct file *f)kfree (data); }snd_card_unref (compr->card); -return 0 ; +return ret; }static int snd_compr_free (struct inode *inode,struct file *f)