Linux 3.4.84
Greg KH
maintainerI'm announcing the release of the 3.4.84 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/mach-sa1100/include/mach/collie.h | 2 + arch/powerpc/kernel/reloc_64.S | 1 arch/x86/kernel/quirks.c | 2 - arch/x86/kvm/svm.c | 6 ++-- drivers/ata/libata-core.c | 1 drivers/firewire/core-device.c | 22 ++++++++++----- drivers/firewire/net.c | 6 ++-- drivers/firewire/sbp2.c | 17 +++++++++-- drivers/gpu/drm/radeon/atombios_encoders.c | 2 - drivers/gpu/drm/ttm/ttm_bo.c | 8 +++-- drivers/net/can/flexcan.c | 4 ++ drivers/net/ethernet/broadcom/tg3.c | 3 -- drivers/net/ethernet/broadcom/tg3.h | 6 +++- drivers/net/virtio_net.c | 3 +- drivers/net/vmxnet3/vmxnet3_drv.c | 19 +++++++++---- drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 4 +- drivers/net/wireless/mwifiex/11n.c | 3 -- drivers/scsi/isci/host.h | 5 +-- drivers/scsi/isci/port_config.c | 7 ---- drivers/scsi/isci/task.c | 2 - drivers/scsi/qla2xxx/qla_def.h | 3 -- drivers/scsi/storvsc_drv.c | 3 ++ fs/btrfs/compression.c | 2 + fs/nfs/delegation.c | 11 ++++--- fs/ocfs2/file.c | 8 ++--- fs/ocfs2/quota_global.c | 27 +++++++++++-------- fs/ocfs2/quota_local.c | 4 -- fs/proc/base.c | 1 include/linux/firewire.h | 1 include/linux/jiffies.h | 8 ++--- include/linux/tracepoint.h | 6 ++++ kernel/cpuset.c | 2 - kernel/irq/manage.c | 3 -- kernel/sched/fair.c | 8 ++--- kernel/trace/trace_events.c | 10 +++++++ kernel/tracepoint.c | 7 ++++ net/mac80211/sta_info.c | 4 ++ net/mac80211/sta_info.h | 7 ++-- net/mac80211/tx.c | 15 ++++++++++ net/sctp/sm_statefuns.c | 7 ++++ sound/pci/oxygen/xonar_dg.c | 12 +++++++- sound/usb/mixer.c | 1 43 files changed, 186 insertions(+), 89 deletions(-)
Al Viro (1):
ocfs2 syncs the wrong range...
Ales Novak (1):
SCSI: storvsc: NULL pointer dereference fix
Alex Deucher (1):
drm/radeon/atom: select the proper number of lanes in transmitter setup
Amitkumar Karwar (1):
mwifiex: copy AP's HT capability info correctly
Anton Blanchard (1):
powerpc: Align p_dyn, p_rela and p_st symbols
Arnd Bergmann (1):
vmxnet3: fix building without CONFIG_PCI_MSI
Artem Fetishev (1):
fs/proc/base.c: fix GPF in /proc/$PID/map_files
Chuansheng Liu (1):
genirq: Remove racy waitqueue_active check
Dan Williams (1):
SCSI: isci: fix reset timeout handling
Daniel Borkmann (1):
net: sctp: fix sctp_sf_do_5_1D_ce to verify if we/peer is AUTH capable
Daniel J Blueman (1):
x86/amd/numa: Fix northbridge quirk to assign correct NUMA node
Emmanuel Grumbach (1):
mac80211: fix AP powersave TX vs. wakeup race
Filipe David Borba Manana (1):
Btrfs: fix data corruption when reading/updating compressed extents
George McCollister (1):
sched: Fix double normalization of vruntime
Giridhar Malavali (1):
SCSI: qla2xxx: Poll during initialization for ISP25xx and ISP83xx
Greg Kroah-Hartman (1):
Linux 3.4.84
Jan Kara (1):
ocfs2: fix quota file corruption
Jason Wang (1):
virtio-net: alloc big buffers also when guest can receive UFO
Li Zefan (1):
cpuset: fix a race condition in __cpuset_node_allowed_softwall()
Linus Walleij (1):
ARM: 7991/1: sa1100: fix compile problem on Collie
Lukasz Dorau (1):
SCSI: isci: correct erroneous for_each_isci_host macro
Marc Kleine-Budde (1):
can: flexcan: flexcan_open(): fix error path if flexcan_chip_start() fails
Michael Chan (1):
tg3: Don't check undefined error bits in RXBD
Michele Baldessari (1):
libata: add ATA_HORKAGE_BROKEN_FPDMA_AA quirk for Seagate Momentus SpinPoint M8 (2BA30001)
Neil Horman (1):
vmxnet3: fix netpoll race condition
Paul E. McKenney (1):
jiffies: Avoid undefined behavior from signed overflow
Radim Krčmář (1):
KVM: SVM: fix cr8 intercept window
Rob Clark (1):
drm/ttm: don't oops if no invalidate_caches()
Roman Volkov (2):
ALSA: oxygen: Xonar DG(X): capture from I2S channel 1, not 2
ALSA: oxygen: modify adjust_dg_dac_routing function
Stefan Richter (1):
firewire: net: fix use after free
Steven Rostedt (Red Hat) (1):
tracing: Do not add event files for modules that fail tracepoints
Sujith Manoharan (1):
ath9k: Fix ETSI compliance for AR9462 2.0
Takashi Iwai (1):
ALSA: usb-audio: Add quirk for Logitech Webcam C500
Tejun Heo (1):
firewire: don't use PREPARE_DELAYED_WORK
Trond Myklebust (1):
NFS: Fix a delegation callback race
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 83 +SUBLEVEL = 84 EXTRAVERSION = NAME = Saber-toothed Squirrel
arch/arm/mach-sa1100/include/mach/collie.h +2 -0
@@ -13,6 +13,8 @@#ifndef __ASM_ARCH_COLLIE_H#define __ASM_ARCH_COLLIE_H +#include "hardware.h" /* Gives GPIO_MAX */ +extern void locomolcd_power (int on);#define COLLIE_SCOOP_GPIO_BASE (GPIO_MAX + 1)
arch/powerpc/kernel/reloc_64.S +1 -0
@@ -81,6 +81,7 @@ _GLOBAL(relocate) 6: blr +.balign 8 p_dyn: .llong __dynamic_start - 0b p_rela: .llong __rela_dyn_start - 0b p_st: .llong _stext - 0b
arch/x86/kernel/quirks.c +1 -1
@@ -525,7 +525,7 @@ static void __init quirk_amd_nb_node(struct pci_dev *dev)return ;pci_read_config_dword (nb_ht,0x60 , &val); - node = val &7 ; + node =pcibus_to_node (dev->bus) | (val &7 );/* * Some hardware may return an invalid node ID, * so check it first:
arch/x86/kvm/svm.c +3 -3
@@ -3007,10 +3007,8 @@ static int cr8_write_interception(struct vcpu_svm *svm)u8 cr8_prev =kvm_get_cr8 (&svm->vcpu);/* instruction emulation calls kvm_set_cr8() */ r =cr_interception (svm); -if (irqchip_in_kernel (svm->vcpu.kvm)) { -clr_cr_intercept (svm,INTERCEPT_CR8_WRITE ); +if (irqchip_in_kernel (svm->vcpu.kvm))return r; - }if (cr8_prev <=kvm_get_cr8 (&svm->vcpu))return r; kvm_run->exit_reason =KVM_EXIT_SET_TPR ;
@@ -3566,6 +3564,8 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu, int tpr, int irr)if (is_guest_mode (vcpu) && (vcpu->arch.hflags &HF_VINTR_MASK ))return ; +clr_cr_intercept (svm,INTERCEPT_CR8_WRITE ); +if (irr ==-1 )return ;
drivers/ata/libata-core.c +1 -0
@@ -4106,6 +4106,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {/* Seagate Momentus SpinPoint M8 seem to have FPMDA_AA issues */ { "ST1000LM024 HN-M101MBB", "2AR10001", ATA_HORKAGE_BROKEN_FPDMA_AA }, + { "ST1000LM024 HN-M101MBB", "2BA30001", ATA_HORKAGE_BROKEN_FPDMA_AA },/* Blacklist entries taken from Silicon Image 3124/3132 Windows driver .inf file - also several Linux problem reports */
drivers/firewire/core-device.c +15 -7
@@ -878,7 +878,7 @@ static int lookup_existing_device(struct device *dev, void *data) old->config_rom_retries =0 ;fw_notice (card,"rediscovered device %s\n" ,dev_name (dev)); -PREPARE_DELAYED_WORK (&old->work, fw_device_update); + old->workfn = fw_device_update;fw_schedule_device_work (old,0 );if (current_node == card->root_node)
@@ -1040,7 +1040,7 @@ static void fw_device_init(struct work_struct *work)if (atomic_cmpxchg (&device->state,FW_DEVICE_INITIALIZING ,FW_DEVICE_RUNNING ) ==FW_DEVICE_GONE ) { -PREPARE_DELAYED_WORK (&device->work, fw_device_shutdown); + device->workfn = fw_device_shutdown;fw_schedule_device_work (device,SHUTDOWN_DELAY ); }else { fw_notice(card, "created device %s: GUID %08x%08x, S%d00\n",
@@ -1172,13 +1172,20 @@ static void fw_device_refresh(struct work_struct *work) dev_name(&device->device)); gone:atomic_set (&device->state,FW_DEVICE_GONE ); -PREPARE_DELAYED_WORK (&device->work, fw_device_shutdown); + device->workfn = fw_device_shutdown;fw_schedule_device_work (device,SHUTDOWN_DELAY ); out:if (node_id == card->root_node->node_id)fw_schedule_bm_work (card,0 ); } +static void fw_device_workfn (struct work_struct *work) +{ +struct fw_device *device =container_of (to_delayed_work (work), + struct fw_device, work); + device->workfn (work); +} +void fw_node_event (struct fw_card *card,struct fw_node *node,int event) {struct fw_device *device;
@@ -1228,7 +1235,8 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)* power-up after getting plugged in. We schedule the * first config rom scan half a second after bus reset. */ -INIT_DELAYED_WORK (&device->work, fw_device_init); + device->workfn = fw_device_init; +INIT_DELAYED_WORK (&device->work, fw_device_workfn);fw_schedule_device_work (device,INITIAL_DELAY );break ;
@@ -1244,7 +1252,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)if (atomic_cmpxchg (&device->state,FW_DEVICE_RUNNING ,FW_DEVICE_INITIALIZING ) ==FW_DEVICE_RUNNING ) { -PREPARE_DELAYED_WORK (&device->work, fw_device_refresh); + device->workfn = fw_device_refresh;fw_schedule_device_work (device, device->is_local ?0 :INITIAL_DELAY ); }
@@ -1259,7 +1267,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)smp_wmb ();/* update node_id before generation */ device->generation = card->generation;if (atomic_read (&device->state) ==FW_DEVICE_RUNNING ) { -PREPARE_DELAYED_WORK (&device->work, fw_device_update); + device->workfn = fw_device_update;fw_schedule_device_work (device,0 ); }break ;
@@ -1284,7 +1292,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event) device = node->data;if (atomic_xchg (&device->state,FW_DEVICE_GONE ) ==FW_DEVICE_RUNNING ) { -PREPARE_DELAYED_WORK (&device->work, fw_device_shutdown); + device->workfn = fw_device_shutdown;fw_schedule_device_work (device,list_empty (&card->link) ?0 :SHUTDOWN_DELAY ); }
drivers/firewire/net.c +3 -3
@@ -1014,8 +1014,6 @@ static void fwnet_write_complete(struct fw_card *card, int rcode,if (rcode ==RCODE_COMPLETE ) {fwnet_transmit_packet_done (ptask); }else { -fwnet_transmit_packet_failed (ptask); -if (printk_timed_ratelimit (&j,1000 ) || rcode != last_rcode) { dev_err(&ptask->dev->netdev->dev, "fwnet_write_complete failed: %x (skipped %d)\n",
@@ -1023,8 +1021,10 @@ static void fwnet_write_complete(struct fw_card *card, int rcode, errors_skipped =0 ; last_rcode = rcode; - }else + }else { errors_skipped++; + } +fwnet_transmit_packet_failed (ptask); } }
drivers/firewire/sbp2.c +13 -4
@@ -146,6 +146,7 @@ struct sbp2_logical_unit {*/ int generation;int retries; +work_func_t workfn;struct delayed_work work;bool has_sdev;bool blocked;
@@ -865,7 +866,7 @@ static void sbp2_login(struct work_struct *work)/* set appropriate retry limit(s) in BUSY_TIMEOUT register */ sbp2_set_busy_timeout (lu); -PREPARE_DELAYED_WORK (&lu->work, sbp2_reconnect); + lu->workfn = sbp2_reconnect;sbp2_agent_reset (lu);/* This was a re-login. */
@@ -919,7 +920,7 @@ static void sbp2_login(struct work_struct *work)* If a bus reset happened, sbp2_update will have requeued * lu->work already. Reset the work from reconnect to login. */ -PREPARE_DELAYED_WORK (&lu->work, sbp2_login); + lu->workfn = sbp2_login; }static void sbp2_reconnect (struct work_struct *work)
@@ -953,7 +954,7 @@ static void sbp2_reconnect(struct work_struct *work) lu->retries++ >= 5) {dev_err (tgt_dev (tgt),"failed to reconnect\n" ); lu->retries =0 ; -PREPARE_DELAYED_WORK (&lu->work, sbp2_login); + lu->workfn = sbp2_login; }sbp2_queue_work (lu,DIV_ROUND_UP (HZ ,5 ));
@@ -973,6 +974,13 @@ static void sbp2_reconnect(struct work_struct *work)sbp2_conditionally_unblock (lu); } +static void sbp2_lu_workfn (struct work_struct *work) +{ +struct sbp2_logical_unit *lu =container_of (to_delayed_work (work), + struct sbp2_logical_unit, work); + lu->workfn (work); +} +static int sbp2_add_logical_unit (struct sbp2_target *tgt,int lun_entry) {struct sbp2_logical_unit *lu;
@@ -999,7 +1007,8 @@ static int sbp2_add_logical_unit(struct sbp2_target *tgt, int lun_entry) lu->blocked = false; ++tgt->dont_block;INIT_LIST_HEAD (&lu->orb_list); -INIT_DELAYED_WORK (&lu->work, sbp2_login); + lu->workfn = sbp2_login; +INIT_DELAYED_WORK (&lu->work, sbp2_lu_workfn);list_add_tail (&lu->link, &tgt->lu_list);return 0 ;
drivers/gpu/drm/radeon/atombios_encoders.c +1 -1
@@ -1048,7 +1048,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t }if (is_dp) args.v5.ucLaneNum = dp_lane_count; -else if (radeon_encoder->pixel_clock >165000 ) +else if (radeon_dig_monitor_is_duallink (encoder, radeon_encoder->pixel_clock)) args.v5.ucLaneNum =8 ;else args.v5.ucLaneNum =4 ;
drivers/gpu/drm/ttm/ttm_bo.c +5 -3
@@ -430,9 +430,11 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, moved:if (bo->evicted) { - ret = bdev->driver->invalidate_caches (bdev, bo->mem.placement); -if (ret) -pr_err ("Can not flush read caches\n" ); +if (bdev->driver->invalidate_caches) { + ret = bdev->driver->invalidate_caches (bdev, bo->mem.placement); +if (ret) +pr_err ("Can not flush read caches\n" ); + } bo->evicted = false; }
drivers/net/can/flexcan.c +3 -1
@@ -805,7 +805,7 @@ static int flexcan_open(struct net_device *dev) err =request_irq (dev->irq, flexcan_irq,IRQF_SHARED , dev->name, dev);if (err) - goto out_close; + goto out_free_irq;/* start chip and queuing */ err =flexcan_chip_start (dev);
@@ -816,6 +816,8 @@ static int flexcan_open(struct net_device *dev)return 0 ; + out_free_irq: +free_irq (dev->irq, dev); out_close:close_candev (dev); out:
drivers/net/ethernet/broadcom/tg3.c +1 -2
@@ -5844,8 +5844,7 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget) work_mask |= opaque_key; -if ((desc->err_vlan &RXD_ERR_MASK ) !=0 && - (desc->err_vlan !=RXD_ERR_ODD_NIBBLE_RCVD_MII )) { +if (desc->err_vlan &RXD_ERR_MASK ) { drop_it:tg3_recycle_rx (tnapi, tpr, opaque_key, desc_idx, *post_ptr);
drivers/net/ethernet/broadcom/tg3.h +5 -1
@@ -2484,7 +2484,11 @@ struct tg3_rx_buffer_desc {#define RXD_ERR_TOO_SMALL 0x00400000#define RXD_ERR_NO_RESOURCES 0x00800000#define RXD_ERR_HUGE_FRAME 0x01000000 -#define RXD_ERR_MASK 0xffff0000 + +#define RXD_ERR_MASK (RXD_ERR_BAD_CRC | RXD_ERR_COLLISION | \ + RXD_ERR_LINK_LOST | RXD_ERR_PHY_DECODE | \ + RXD_ERR_MAC_ABRT | RXD_ERR_TOO_SMALL | \ + RXD_ERR_NO_RESOURCES | RXD_ERR_HUGE_FRAME)u32 reserved;u32 opaque;
drivers/net/virtio_net.c +2 -1
@@ -1084,7 +1084,8 @@ static int virtnet_probe(struct virtio_device *vdev)/* If we can receive ANY GSO packets, we must allocate large ones. */ if (virtio_has_feature (vdev,VIRTIO_NET_F_GUEST_TSO4 ) ||virtio_has_feature (vdev,VIRTIO_NET_F_GUEST_TSO6 ) || -virtio_has_feature (vdev,VIRTIO_NET_F_GUEST_ECN )) +virtio_has_feature (vdev,VIRTIO_NET_F_GUEST_ECN ) || +virtio_has_feature (vdev,VIRTIO_NET_F_GUEST_UFO )) vi->big_packets = true;if (virtio_has_feature (vdev,VIRTIO_NET_F_MRG_RXBUF ))
drivers/net/vmxnet3/vmxnet3_drv.c +14 -5
@@ -1729,11 +1729,20 @@ vmxnet3_netpoll(struct net_device *netdev) {struct vmxnet3_adapter *adapter =netdev_priv (netdev); -if (adapter->intr.mask_mode ==VMXNET3_IMM_ACTIVE ) -vmxnet3_disable_all_intrs (adapter); - -vmxnet3_do_poll (adapter, adapter->rx_queue[0 ].rx_ring[0 ].size); -vmxnet3_enable_all_intrs (adapter); +switch (adapter->intr.type) { +#ifdef CONFIG_PCI_MSI +case VMXNET3_IT_MSIX : { +int i; +for (i =0 ; i < adapter->num_rx_queues; i++) +vmxnet3_msix_rx (0 , &adapter->rx_queue[i]); +break ; + } +#endif +case VMXNET3_IT_MSI : +default : +vmxnet3_intr (0 , adapter->netdev); +break ; + } }#endif /* CONFIG_NET_POLL_CONTROLLER */
drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h +2 -2
@@ -55,7 +55,7 @@ static const u32 ar9462_2p0_baseband_postamble[][5] = { {0x00009e14, 0x37b95d5e, 0x37b9605e, 0x3376605e, 0x33795d5e}, {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c}, - {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce}, + {0x00009e20, 0x000003a5, 0x000003a5, 0x000003a5, 0x000003a5}, {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021}, {0x00009e3c, 0xcf946220, 0xcf946220, 0xcfd5c782, 0xcfd5c282}, {0x00009e44, 0x62321e27, 0x62321e27, 0xfe291e27, 0xfe291e27},
@@ -94,7 +94,7 @@ static const u32 ar9462_2p0_baseband_postamble[][5] = { {0x0000ae04, 0x001c0000, 0x001c0000, 0x001c0000, 0x00100000}, {0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, {0x0000ae1c, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c}, - {0x0000ae20, 0x000001b5, 0x000001b5, 0x000001ce, 0x000001ce}, + {0x0000ae20, 0x000001a6, 0x000001a6, 0x000001aa, 0x000001aa}, {0x0000b284, 0x00000000, 0x00000000, 0x00000550, 0x00000550}, };
drivers/net/wireless/mwifiex/11n.c +1 -2
@@ -340,8 +340,7 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv, ht_cap->header.len =cpu_to_le16 (sizeof (struct ieee80211_ht_cap ));memcpy ((u8 *) ht_cap +sizeof (struct mwifiex_ie_types_header ), - (u8 *) bss_desc->bcn_ht_cap + -sizeof (struct ieee_types_header ), + (u8 *)bss_desc->bcn_ht_cap,le16_to_cpu (ht_cap->header.len));mwifiex_fill_cap_info (priv, radio_type, ht_cap);
drivers/scsi/isci/host.h +2 -3
@@ -310,9 +310,8 @@ static inline struct isci_pci_info *to_pci_info(struct pci_dev *pdev) }#define for_each_isci_host (id, ihost, pdev) \ - for (id = 0, ihost = to_pci_info(pdev)->hosts[id]; \ - id < ARRAY_SIZE(to_pci_info(pdev)->hosts) && ihost; \ - ihost = to_pci_info(pdev)->hosts[++id]) + for (id = 0; id < SCI_MAX_CONTROLLERS && \ + (ihost = to_pci_info(pdev)->hosts[id]); id++)static inline enum isci_status isci_host_get_state (struct isci_host *isci_host) {
drivers/scsi/isci/port_config.c +0 -7
@@ -619,13 +619,6 @@ static void sci_apc_agent_link_up(struct isci_host *ihost, SCIC_SDS_APC_WAIT_LINK_UP_NOTIFICATION); }else {/* the phy is already the part of the port */ -u32 port_state = iport->sm.current_state_id; - -/* if the PORT'S state is resetting then the link up is from -* port hard reset in this case, we need to tell the port -* that link up is recieved -*/ -BUG_ON (port_state !=SCI_PORT_RESETTING ); port_agent->phy_ready_mask |=1 << phy_index;sci_port_link_up (iport, iphy); }
drivers/scsi/isci/task.c +1 -1
@@ -1312,7 +1312,7 @@ int isci_task_I_T_nexus_reset(struct domain_device *dev)/* XXX: need to cleanup any ireqs targeting this * domain_device */ - ret =TMF_RESP_FUNC_COMPLETE ; + ret = -ENODEV ; goto out; }
drivers/scsi/qla2xxx/qla_def.h +1 -2
@@ -2600,8 +2600,7 @@ struct qla_hw_data { IS_QLA25XX(ha) || IS_QLA81XX(ha) || \ IS_QLA82XX(ha) || IS_QLA83XX(ha))#define IS_MSIX_NACK_CAPABLE (ha) (IS_QLA81XX(ha) || IS_QLA83XX(ha)) -#define IS_NOPOLLING_TYPE (ha) ((IS_QLA25XX(ha) || IS_QLA81XX(ha) || \ - IS_QLA83XX(ha)) && (ha)->flags.msix_enabled) +#define IS_NOPOLLING_TYPE (ha) (IS_QLA81XX(ha) && (ha)->flags.msix_enabled)#define IS_FAC_REQUIRED (ha) (IS_QLA81XX(ha) || IS_QLA83XX(ha))#define IS_NOCACHE_VPD_TYPE (ha) (IS_QLA81XX(ha) || IS_QLA83XX(ha))#define IS_ALOGIO_CAPABLE (ha) (IS_QLA23XX(ha) || IS_FWI2_CAPABLE(ha))
drivers/scsi/storvsc_drv.c +3 -0
@@ -1131,6 +1131,9 @@ static void storvsc_device_destroy(struct scsi_device *sdevice) {struct stor_mem_pools *memp = sdevice->hostdata; +if (!memp) +return ; +mempool_destroy (memp->request_mempool);kmem_cache_destroy (memp->request_pool);kfree (memp);
fs/btrfs/compression.c +2 -0
@@ -995,6 +995,8 @@ int btrfs_decompress_buf2page(char *buf, unsigned long buf_start, bytes =min (bytes, working_bytes); kaddr =kmap_atomic (page_out);memcpy (kaddr + *pg_offset, buf + buf_offset, bytes); +if (*pg_index == (vcnt -1 ) && *pg_offset ==0 ) +memset (kaddr + bytes,0 ,PAGE_CACHE_SIZE - bytes);kunmap_atomic (kaddr);flush_dcache_page (page_out);
fs/nfs/delegation.c +7 -4
@@ -540,16 +540,19 @@ int nfs_async_inode_return_delegation(struct inode *inode,rcu_read_lock (); delegation =rcu_dereference (NFS_I (inode)->delegation); +if (delegation ==NULL ) + goto out_enoent; -if (!clp->cl_mvops->match_stateid (&delegation->stateid, stateid)) { -rcu_read_unlock (); -return -ENOENT ; - } +if (!clp->cl_mvops->match_stateid (&delegation->stateid, stateid)) + goto out_enoent;nfs_mark_return_delegation (server, delegation);rcu_read_unlock ();nfs_delegation_run_state_manager (clp);return 0 ; +out_enoent: +rcu_read_unlock (); +return -ENOENT ; } static struct inode *
fs/ocfs2/file.c +4 -4
@@ -2389,8 +2389,8 @@ out_dio:if (((file->f_flags &O_DSYNC ) && !direct_io) ||IS_SYNC (inode) || ((file->f_flags &O_DIRECT ) && !direct_io)) { - ret =filemap_fdatawrite_range (file->f_mapping, pos, - pos + count -1 ); + ret =filemap_fdatawrite_range (file->f_mapping, *ppos, + *ppos + count -1 );if (ret <0 ) written = ret;
@@ -2403,8 +2403,8 @@ out_dio: }if (!ret) - ret =filemap_fdatawait_range (file->f_mapping, pos, - pos + count -1 ); + ret =filemap_fdatawait_range (file->f_mapping, *ppos, + *ppos + count -1 ); }/*
fs/ocfs2/quota_global.c +17 -10
@@ -712,6 +712,12 @@ static int ocfs2_release_dquot(struct dquot *dquot)*/ if (status <0 )mlog_errno (status); +/* +* Clear dq_off so that we search for the structure in quota file next +* time we acquire it. The structure might be deleted and reallocated +* elsewhere by another node while our dquot structure is on freelist. +*/ + dquot->dq_off =0 ;clear_bit (DQ_ACTIVE_B , &dquot->dq_flags); out_trans:ocfs2_commit_trans (osb, handle);
@@ -750,16 +756,17 @@ static int ocfs2_acquire_dquot(struct dquot *dquot) status =ocfs2_lock_global_qf (info,1 );if (status <0 ) goto out; -if (!test_bit (DQ_READ_B , &dquot->dq_flags)) { - status =ocfs2_qinfo_lock (info,0 ); -if (status <0 ) - goto out_dq; - status =qtree_read_dquot (&info->dqi_gi, dquot); -ocfs2_qinfo_unlock (info,0 ); -if (status <0 ) - goto out_dq; - } -set_bit (DQ_READ_B , &dquot->dq_flags); + status =ocfs2_qinfo_lock (info,0 ); +if (status <0 ) + goto out_dq; +/* +* We always want to read dquot structure from disk because we don't +* know what happened with it while it was on freelist. +*/ + status =qtree_read_dquot (&info->dqi_gi, dquot); +ocfs2_qinfo_unlock (info,0 ); +if (status <0 ) + goto out_dq;OCFS2_DQUOT (dquot)->dq_use_count++;OCFS2_DQUOT (dquot)->dq_origspace = dquot->dq_dqb.dqb_curspace;
fs/ocfs2/quota_local.c +0 -4
@@ -1300,10 +1300,6 @@ int ocfs2_local_release_dquot(handle_t *handle, struct dquot *dquot)ocfs2_journal_dirty (handle, od->dq_chunk->qc_headerbh); out: -/* Clear the read bit so that next time someone uses this -* dquot he reads fresh info from disk and allocates local -* dquot structure */ -clear_bit (DQ_READ_B , &dquot->dq_flags);return status; }
fs/proc/base.c +1 -0
@@ -2092,6 +2092,7 @@ static int proc_map_files_get_link(struct dentry *dentry, struct path *path)if (rc) goto out_mmput; + rc = -ENOENT ;down_read (&mm->mmap_sem); vma =find_exact_vma (mm, vm_start, vm_end);if (vma && vma->vm_file) {
include/linux/firewire.h +1 -0
@@ -186,6 +186,7 @@ struct fw_device { unsigned irmc:1; unsigned bc_implemented:2; +work_func_t workfn;struct delayed_work work;struct fw_attribute_group attribute_group; };
include/linux/jiffies.h +4 -4
@@ -106,13 +106,13 @@ static inline u64 get_jiffies_64(void)#define time_after (a,b) \ (typecheck(unsigned long, a) && \ typecheck(unsigned long, b) && \ - ((long)(b) - (long)(a) < 0)) + ((long)((b) - (a)) < 0))#define time_before (a,b) time_after(b,a)#define time_after_eq (a,b) \ (typecheck(unsigned long, a) && \ typecheck(unsigned long, b) && \ - ((long)(a) - (long)(b) >= 0)) + ((long)((a) - (b)) >= 0))#define time_before_eq (a,b) time_after_eq(b,a)/*
@@ -135,13 +135,13 @@ static inline u64 get_jiffies_64(void)#define time_after64 (a,b) \ (typecheck(__u64, a) && \ typecheck(__u64, b) && \ - ((__s64)(b) - (__s64)(a) < 0)) + ((__s64)((b) - (a)) < 0))#define time_before64 (a,b) time_after64(b,a)#define time_after_eq64 (a,b) \ (typecheck(__u64, a) && \ typecheck(__u64, b) && \ - ((__s64)(a) - (__s64)(b) >= 0)) + ((__s64)((a) - (b)) >= 0))#define time_before_eq64 (a,b) time_after_eq64(b,a)/*
include/linux/tracepoint.h +6 -0
@@ -60,6 +60,12 @@ struct tp_module {unsigned int num_tracepoints;struct tracepoint *const *tracepoints_ptrs; }; +bool trace_module_has_bad_taint (struct module *mod); +#else +static inline bool trace_module_has_bad_taint (struct module *mod) +{ +return false; +}#endif /* CONFIG_MODULES */ struct tracepoint_iter {
kernel/cpuset.c +1 -1
@@ -2338,9 +2338,9 @@ int __cpuset_node_allowed_softwall(int node, gfp_t gfp_mask)task_lock (current); cs =nearest_hardwall_ancestor (task_cs (current)); + allowed =node_isset (node, cs->mems_allowed);task_unlock (current); - allowed =node_isset (node, cs->mems_allowed);mutex_unlock (&callback_mutex);return allowed; }
kernel/irq/manage.c +1 -2
@@ -777,8 +777,7 @@ static irqreturn_t irq_thread_fn(struct irq_desc *desc,static void wake_threads_waitq (struct irq_desc *desc) { -if (atomic_dec_and_test (&desc->threads_active) && -waitqueue_active (&desc->wait_for_threads)) +if (atomic_dec_and_test (&desc->threads_active))wake_up (&desc->wait_for_threads); }
kernel/sched/fair.c +4 -4
@@ -5270,15 +5270,15 @@ static void switched_from_fair(struct rq *rq, struct task_struct *p)struct cfs_rq *cfs_rq =cfs_rq_of (se);/* -* Ensure the task's vruntime is normalized, so that when its +* Ensure the task's vruntime is normalized, so that when it's * switched back to the fair class the enqueue_entity(.flags=0) will * do the right thing. * -* If it was on_rq, then the dequeue_entity(.flags=0) will already -* have normalized the vruntime, if it was !on_rq, then only when +* If it's on_rq, then the dequeue_entity(.flags=0) will already +* have normalized the vruntime, if it's !on_rq, then only when * the task is sleeping will it still have non-normalized vruntime. */ -if (!se->on_rq && p->state !=TASK_RUNNING ) { +if (!p->on_rq && p->state !=TASK_RUNNING ) {/* * Fix up our vruntime so that the current sleep doesn't * cause 'unlimited' sleep bonus.
kernel/trace/trace_events.c +10 -0
@@ -1354,6 +1354,16 @@ static void trace_module_add_events(struct module *mod)struct ftrace_module_file_ops *file_ops =NULL ;struct ftrace_event_call **call, **start, **end; +if (!mod->num_trace_events) +return ; + +/* Don't add infrastructure for mods without tracepoints */ +if (trace_module_has_bad_taint (mod)) { +pr_err ("%s: module has bad taint, not creating trace events\n" , + mod->name); +return ; + } + start = mod->trace_events; end = mod->trace_events + mod->num_trace_events;
kernel/tracepoint.c +6 -1
@@ -628,6 +628,11 @@ void tracepoint_iter_reset(struct tracepoint_iter *iter)EXPORT_SYMBOL_GPL (tracepoint_iter_reset);#ifdef CONFIG_MODULES +bool trace_module_has_bad_taint (struct module *mod) +{ +return mod->taints & ~((1 <<TAINT_OOT_MODULE ) | (1 <<TAINT_CRAP )); +} +static int tracepoint_module_coming (struct module *mod) {struct tp_module *tp_mod, *iter;
@@ -638,7 +643,7 @@ static int tracepoint_module_coming(struct module *mod)* module headers (for forced load), to make sure we don't cause a crash. * Staging and out-of-tree GPL modules are fine. */ -if (mod->taints & ~((1 <<TAINT_OOT_MODULE ) | (1 <<TAINT_CRAP ))) +if (trace_module_has_bad_taint (mod))return 0 ;mutex_lock (&tracepoints_mutex); tp_mod =kmalloc (sizeof (struct tp_module ),GFP_KERNEL );
net/mac80211/sta_info.c +4 -0
@@ -242,6 +242,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,return NULL ;spin_lock_init (&sta->lock); +spin_lock_init (&sta->ps_lock);INIT_WORK (&sta->drv_unblock_wk, sta_unblock);INIT_WORK (&sta->ampdu_mlme.work, ieee80211_ba_session_work);mutex_init (&sta->ampdu_mlme.mtx);
@@ -971,6 +972,8 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)skb_queue_head_init (&pending); +/* sync with ieee80211_tx_h_unicast_ps_buf */ +spin_lock (&sta->ps_lock);/* Send all buffered frames to the station */ for (ac =0 ; ac <IEEE80211_NUM_ACS ; ac++) {int count =skb_queue_len (&pending), tmp;
@@ -990,6 +993,7 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta) }ieee80211_add_pending_skbs_fn (local, &pending, clear_sta_ps_flags, sta); +spin_unlock (&sta->ps_lock); local->total_ps_buffered -= buffered;
net/mac80211/sta_info.h +3 -4
@@ -227,6 +227,7 @@ struct sta_ampdu_mlme {* @drv_unblock_wk: used for driver PS unblocking * @listen_interval: listen interval of this station, when we're acting as AP * @_flags: STA flags, see &enum ieee80211_sta_info_flags, do not use directly +* @ps_lock: used for powersave (when mac80211 is the AP) related locking * @ps_tx_buf: buffers (per AC) of frames to transmit to this station * when it leaves power saving state or polls * @tx_filtered: buffers (per AC) of frames we already tried to
@@ -297,10 +298,8 @@ struct sta_info {/* use the accessors defined below */ unsigned long _flags; -/* -* STA powersave frame queues, no more than the internal -* locking required. -*/ +/* STA powersave lock and frame queues */ +spinlock_t ps_lock;struct sk_buff_head ps_tx_buf[IEEE80211_NUM_ACS ];struct sk_buff_head tx_filtered[IEEE80211_NUM_ACS ];unsigned long driver_buffered_tids;
net/mac80211/tx.c +15 -0
@@ -471,6 +471,20 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx)#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ if (tx->local->total_ps_buffered >=TOTAL_MAX_TX_BUFFER )purge_old_ps_buffers (tx->local); + +/* sync with ieee80211_sta_ps_deliver_wakeup */ +spin_lock (&sta->ps_lock); +/* +* STA woke up the meantime and all the frames on ps_tx_buf have +* been queued to pending queue. No reordering can happen, go +* ahead and Tx the packet. +*/ +if (!test_sta_flag (sta,WLAN_STA_PS_STA ) && + !test_sta_flag (sta,WLAN_STA_PS_DRIVER )) { +spin_unlock (&sta->ps_lock); +return TX_CONTINUE ; + } +if (skb_queue_len (&sta->ps_tx_buf[ac]) >=STA_MAX_TX_BUFFER ) {struct sk_buff *old =skb_dequeue (&sta->ps_tx_buf[ac]);#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
@@ -487,6 +501,7 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) info->control.vif = &tx->sdata->vif; info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ;skb_queue_tail (&sta->ps_tx_buf[ac], tx->skb); +spin_unlock (&sta->ps_lock);if (!timer_pending (&local->sta_cleanup)) mod_timer(&local->sta_cleanup,
net/sctp/sm_statefuns.c +7 -0
@@ -747,6 +747,13 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep,struct sctp_chunk auth;sctp_ierror_t ret; +/* Make sure that we and the peer are AUTH capable */ +if (!sctp_auth_enable || !new_asoc->peer.auth_capable) { +kfree_skb (chunk->auth_chunk); +sctp_association_free (new_asoc); +return sctp_sf_pdiscard (ep, asoc, type, arg, commands); + } +/* set-up our fake chunk so that we can process it */ auth.skb = chunk->auth_chunk; auth.asoc = chunk->asoc;
sound/pci/oxygen/xonar_dg.c +11 -1
@@ -294,6 +294,16 @@ static int output_switch_put(struct snd_kcontrol *ctl,oxygen_write16_masked (chip,OXYGEN_GPIO_DATA , data->output_sel ==1 ?GPIO_HP_REAR :0 ,GPIO_HP_REAR ); +oxygen_write8_masked (chip,OXYGEN_PLAY_ROUTING , + data->output_sel ==0 ? +OXYGEN_PLAY_MUTE01 : +OXYGEN_PLAY_MUTE23 | +OXYGEN_PLAY_MUTE45 | +OXYGEN_PLAY_MUTE67 , +OXYGEN_PLAY_MUTE01 | +OXYGEN_PLAY_MUTE23 | +OXYGEN_PLAY_MUTE45 | +OXYGEN_PLAY_MUTE67 ); }mutex_unlock (&chip->mutex);return changed;
@@ -597,7 +607,7 @@ struct oxygen_model model_xonar_dg = { .model_data_size = sizeof(struct dg), .device_config =PLAYBACK_0_TO_I2S |PLAYBACK_1_TO_SPDIF | -CAPTURE_0_FROM_I2S_2 | +CAPTURE_0_FROM_I2S_1 | CAPTURE_1_FROM_SPDIF, .dac_channels_pcm = 6, .dac_channels_mixer = 0,
sound/usb/mixer.c +1 -0
@@ -819,6 +819,7 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval, }break ; +case USB_ID (0x046d ,0x0807 ):/* Logitech Webcam C500 */ case USB_ID (0x046d ,0x0808 ):case USB_ID (0x046d ,0x0809 ):case USB_ID (0x046d ,0x081b ):/* HD Webcam c310 */