Linux 3.14.7
Greg KH
maintainerI'm announcing the release of the 3.14.7 kernel.
All users of the 3.14 kernel series must upgrade.
The updated 3.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.14.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
------------
Documentation/DocBook/media/Makefile | 2 Documentation/debugging-via-ohci1394.txt | 13 ++- Documentation/device-mapper/thin-provisioning.txt | 5 + Makefile | 2 arch/arm/include/asm/uaccess.h | 3 arch/arm/kernel/entry-header.S | 4 + arch/arm/mach-imx/devices/platform-ipu-core.c | 2 arch/arm/mach-omap2/board-flash.c | 2 arch/arm/mach-omap2/cclock3xxx_data.c | 3 arch/arm/mach-omap2/cpuidle44xx.c | 25 ++++++- arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 2 arch/mips/kernel/traps.c | 4 - drivers/ata/libata-core.c | 8 +- drivers/block/virtio_blk.c | 4 - drivers/cpufreq/cpufreq-cpu0.c | 16 +++- drivers/cpufreq/cpufreq_governor.c | 6 + drivers/cpufreq/intel_pstate.c | 72 ++++++++++++---------- drivers/firewire/core.h | 4 - drivers/firewire/ohci.c | 2 drivers/gpio/gpio-mcp23s08.c | 11 ++- drivers/gpu/drm/i915/i915_drv.h | 1 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 54 +++++++++------- drivers/gpu/drm/i915/intel_crt.c | 1 drivers/gpu/drm/i915/intel_display.c | 14 +++- drivers/gpu/drm/i915/intel_dp.c | 23 ++++++- drivers/gpu/drm/i915/intel_drv.h | 8 ++ drivers/gpu/drm/i915/intel_dsi.c | 1 drivers/gpu/drm/i915/intel_dvo.c | 1 drivers/gpu/drm/i915/intel_hdmi.c | 1 drivers/gpu/drm/i915/intel_lvds.c | 1 drivers/gpu/drm/i915/intel_sdvo.c | 1 drivers/gpu/drm/i915/intel_tv.c | 1 drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c | 2 drivers/gpu/drm/radeon/atombios_crtc.c | 6 - drivers/gpu/drm/radeon/radeon_asic.c | 4 - drivers/gpu/drm/radeon/radeon_bios.c | 14 ++++ drivers/gpu/drm/radeon/radeon_cs.c | 15 +++- drivers/gpu/drm/radeon/radeon_device.c | 4 + drivers/gpu/drm/radeon/radeon_object.c | 38 +++++++---- drivers/gpu/drm/radeon/radeon_pm.c | 43 ++++++++++++- drivers/gpu/drm/radeon/sid.h | 4 - drivers/hwmon/Kconfig | 2 drivers/hwmon/ntc_thermistor.c | 15 ++-- drivers/infiniband/ulp/isert/ib_isert.c | 2 drivers/iommu/intel-iommu.c | 18 +++++ drivers/md/dm-cache-target.c | 2 drivers/md/dm-thin.c | 12 ++- drivers/md/md.c | 5 + drivers/scsi/scsi_transport_sas.c | 3 drivers/staging/comedi/drivers/ni_daq_700.c | 2 drivers/staging/rtl8192e/rtllib_tx.c | 2 drivers/staging/speakup/main.c | 1 drivers/staging/speakup/selection.c | 52 +++++++++++++-- drivers/staging/speakup/speakup.h | 1 drivers/target/iscsi/iscsi_target_login.c | 57 ++++++++--------- drivers/target/target_core_configfs.c | 5 + drivers/tty/tty_buffer.c | 2 drivers/usb/core/driver.c | 9 +- drivers/usb/core/hub.c | 15 +++- drivers/usb/host/pci-quirks.c | 7 ++ drivers/usb/host/xhci-mem.c | 20 +++--- drivers/usb/serial/ftdi_sio.c | 2 drivers/usb/serial/ftdi_sio_ids.h | 5 + drivers/usb/serial/io_ti.c | 2 drivers/usb/serial/io_usbvend.h | 2 drivers/usb/serial/option.c | 2 fs/proc/task_mmu.c | 2 include/linux/percpu-refcount.h | 6 - include/uapi/linux/usb/Kbuild | 1 include/uapi/linux/usb/cdc-wdm.h | 2 kernel/cpu.c | 6 + kernel/events/core.c | 63 ++++++++++++------- kernel/sched/core.c | 55 +++++++++++----- kernel/sched/cpudeadline.c | 4 - kernel/sched/cpupri.c | 3 kernel/sched/cputime.c | 32 ++++----- kernel/sched/deadline.c | 10 ++- mm/memory-failure.c | 2 mm/mempolicy.c | 6 + mm/rmap.c | 3 mm/vmscan.c | 18 ----- net/bluetooth/l2cap_core.c | 4 - net/ipv6/netfilter.c | 6 + net/netfilter/nfnetlink.c | 8 +- sound/pci/hda/patch_analog.c | 1 sound/pci/hda/patch_realtek.c | 10 +-- 86 files changed, 619 insertions(+), 295 deletions(-)
Alan Stern (1):
USB: Avoid runtime suspend loops for HCDs that can't handle suspend/resume
Alex Deucher (4):
drm/radeon: fix register typo on si
drm/radeon: handle non-VGA class pci devices with ATRM drm/radeon/pm: don't allow debugfs/sysfs access when PX card is off (v2) drm/radeon/dpm: resume fixes for some systems
Alexej Starschenko (1):
USB: serial: option: add support for Novatel E371 PCIe card
Andrey Ryabinin (2):
ARM: 8051/1: put_user: fix possible data corruption in put_user
mm: rmap: fix use-after-free in __put_anon_vma
Ben Hutchings (2):
Staging: speakup: Move pasting into a work item
Staging: speakup: Update __speakup_paste_selection() tty (ab)usage to match vt
Ben Skeggs (1):
drm/gf119-/disp: fix nasty bug which can clobber SOR0's clock setup
Bibek Basu (1):
cpufreq: remove race while accessing cur_policy
Bjørn Mork (1):
usb: cdc-wdm: export cdc-wdm uapi header
Chris Wilson (1):
drm/i915: Only copy back the modified fields to userspace from execbuffer
Christian König (3):
drm/radeon: also try GART for CPU accessed buffers drm/radeon: avoid crash if VM command submission isn't available drm/radeon: use the CP DMA on CIK
David Woodhouse (1):
iommu/vt-d: Fix missing IOTLB flush in intel_iommu_unmap()
Denys Fedoryshchenko (1):
netfilter: nfnetlink: Fix use after free when it fails to process batch
Dirk Brandewie (4):
intel_pstate: remove unneeded sample buffers
intel_pstate: Remove C0 tracking
intel_pstate: Correct rounding in busy calculation
intel_pstate: add sample time scaling
Doug Smythies (1):
intel_pstate: Improve initial busy calculation
Emil Goode (1):
ARM: imx: fix error handling in ipu device registration
George McCollister (1):
USB: ftdi_sio: add NovaTech OrionLXm product ID
Greg Kroah-Hartman (3):
Revert "revert "mm: vmscan: do not swap anon pages just because free+file is low""
USB: cdc-wdm: properly include types.h
Linux 3.14.7
Heinz Mauelshagen (1):
dm cache: always split discards on cache block boundaries
Ian Abbott (1):
staging: comedi: ni_daq_700: add mux settling delay
Imre Deak (2):
drm/i915: add unregister callback to connector drm/i915: dp: fix order of dp aux i2c device cleanup
Jean Delvare (2):
hwmon: (ntc_thermistor) Fix dependencies
hwmon: (ntc_thermistor) Fix OF device ID mapping
Jiri Olsa (1):
perf: Prevent false warning in perf_swevent_add
Joe Lawrence (1):
SCSI: scsi_transport_sas: move bsg destructor into sas_rphy_remove
Johan Hovold (1):
USB: io_ti: fix firmware download on big-endian machines (part 2)
Johannes Berg (1):
Documentation: fix DOCBOOKS=... building
Juri Lelli (1):
sched/deadline: Restrict user params max value to 2^63 ns
Kirill Tkhai (1):
sched/dl: Fix race in dl_task_timer()
Lai Jiangshan (1):
sched: Fix hotplug vs. set_cpus_allowed_ptr()
Laurent Pinchart (1):
ARM: OMAP3: clock: Back-propagate rate change from cam_mclk to dpll4_m5 on all OMAP3 platforms
Li Zefan (1):
sched/deadline: Fix memory leak
Lucas Stach (1):
cpufreq: cpu0: drop wrong devm usage
Markos Chandras (1):
MIPS: Fix typo when reporting cache and ftlb errors for ImgTec cores
Martin K. Petersen (1):
libata: Blacklist queued trim for Crucial M500
Mathias Nyman (2):
xhci: delete endpoints from bandwidth list before freeing whole device
usb: pci-quirks: Prevent Sony VAIO t-series from switching usb ports
Michael Kerrisk (1):
sched: Make sched_setattr() correctly return -EFBIG
Michael Welling (1):
gpio: mcp23s08: Bug fix of SPI device tree registration.
Mike Snitzer (1):
dm thin: add 'no_space_timeout' dm-thin-pool module param
Ming Lei (1):
virtio_blk: fix race between start and stop queue
Naoya Horiguchi (2):
mm/memory-failure.c: fix memory leak by race between poison and unpoison
mm: add !pte_present() check on existing hugetlb_entry callbacks
NeilBrown (2):
md: always set MD_RECOVERY_INTR when aborting a reshape or other "resync".
md: always set MD_RECOVERY_INTR when interrupting a reshape thread.
Nicholas Bellinger (2):
iser-target: Add missing target_put_sess_cmd for ImmedateData failure
target: Fix alua_access_state attribute OOPs for un-configured devices
Peter Ujfalusi (1):
ARM: omap5: hwmod_data: Correct IDLEMODE for McPDM
Peter Zijlstra (4):
perf: Limit perf_event_attr::sample_period to 63 bits
perf: Fix race in removing an event
sched: Disallow sched_attr::sched_policy < 0 sched/deadline: Change sched_getparam() behaviour vs SCHED_DEADLINE
Rabin Vincent (1):
ARM: 8064/1: fix v7-M signal return
Richard Weinberger (1):
sched: Fix sched_policy < 0 comparison
Roger Quadros (1):
ARM: OMAP2+: nand: Fix NAND on OMAP2 and OMAP3 boards
Roland Dreier (1):
iscsi-target: Fix wrong buffer / buffer overrun in iscsi_change_param_value()
Ronan Marquet (1):
ALSA: hda/realtek - Correction of fixup codes for PB V7900 laptop
Samuel Ortiz (1):
Bluetooth: Fix L2CAP LE debugfs entries permissions
Santosh Shilimkar (1):
ARM: OMAP4: Fix the boot regression with CPU_IDLE enabled
Sean MacLennan (1):
staging: r8192e_pci: fix htons error
Sebastian Ott (1):
percpu-refcount: fix usage of this_cpu_ops
Sergey Popovich (1):
netfilter: Fix potential use after free in ip6_route_me_harder()
Stefan Richter (1):
firewire: revert to 4 GB RDMA, fix protocols using Memory Space
Steven Rostedt (Red Hat) (1):
sched: Use CPUPRI_NR_PRIORITIES instead of MAX_RT_PRIO in cpupri check
Takashi Iwai (2):
ALSA: hda/analog - Fix silent output on ASUS A8JN
ALSA: hda/realtek - Fix COEF widget NID for ALC260 replacer fixup
Thomas Gleixner (1):
sched: Sanitize irq accounting madness
Greg KH
maintainerDocumentation/DocBook/media/Makefile +1 -1
@@ -195,7 +195,7 @@ DVB_DOCUMENTED = \ # install_media_images = \ - $(Q)cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api + $(Q)-cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64 $(Q)base64 -d $< >$@
Documentation/debugging-via-ohci1394.txt +8 -5
@@ -25,9 +25,11 @@ using data transfer rates in the order of 10MB/s or more. With most FireWire controllers, memory access is limited to the low 4 GB of physical address space. This can be a problem on IA64 machines where memory is located mostly above that limit, but it is rarely a problem on -more common hardware such as x86, x86-64 and PowerPC. However, at least -Agere/LSI FW643e and FW643e2 controllers are known to support access to -physical addresses above 4 GB. +more common hardware such as x86, x86-64 and PowerPC. + +At least LSI FW643e and FW643e2 controllers are known to support access to +physical addresses above 4 GB, but this feature is currently not enabled by +Linux. Together with a early initialization of the OHCI-1394 controller for debugging, this facility proved most useful for examining long debugs logs in the printk
@@ -101,8 +103,9 @@ Step-by-step instructions for using firescope with early OHCI initialization: compliant, they are based on TI PCILynx chips and require drivers for Win- dows operating systems. - The mentioned kernel log message contains ">4 GB phys DMA" in case of - OHCI-1394 controllers which support accesses above this limit. + The mentioned kernel log message contains the string "physUB" if the + controller implements a writable Physical Upper Bound register. This is + required for physical DMA above 4 GB (but not utilized by Linux yet). 2) Establish a working FireWire cable connection:
Documentation/device-mapper/thin-provisioning.txt +4 -1
@@ -309,7 +309,10 @@ ii) Status error_if_no_space|queue_if_no_space If the pool runs out of data or metadata space, the pool will either queue or error the IO destined to the data device. The - default is to queue the IO until more space is added. + default is to queue the IO until more space is added or the + 'no_space_timeout' expires. The 'no_space_timeout' dm-thin-pool + module parameter can be used to change this timeout -- it + defaults to 60 seconds but may be disabled using a value of 0. iii) Messages
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 14 -SUBLEVEL = 6 +SUBLEVEL = 7 EXTRAVERSION = NAME = Remembering Coco
arch/arm/include/asm/uaccess.h +2 -1
@@ -171,8 +171,9 @@ extern int __put_user_8(void *, unsigned long long);#define __put_user_check (x,p) \ ({ \ unsigned long __limit = current_thread_info()->addr_limit - 1; \ + const typeof(*(p)) __user *__tmp_p = (p); \ register const typeof(*(p)) __r2 asm("r2") = (x); \ - register const typeof(*(p)) __user *__p asm("r0") = (p);\ + register const typeof(*(p)) __user *__p asm("r0") = __tmp_p; \ register unsigned long __l asm("r1") = __limit; \ register int __e asm("r0"); \ switch (sizeof(*(__p))) { \
arch/arm/kernel/entry-header.S +4 -0
@@ -132,6 +132,10 @@ orrne r5, V7M_xPSR_FRAMEPTRALIGN biceq r5, V7M_xPSR_FRAMEPTRALIGN + @ ensure bit 0 is cleared in the PC, otherwise behaviour is + @ unpredictable + bic r4, #1 + @ write basic exception frame stmdb r2!, {r1, r3-r5} ldmia sp, {r1, r3-r5}
arch/arm/mach-imx/devices/platform-ipu-core.c +1 -1
@@ -77,7 +77,7 @@ struct platform_device *__init imx_alloc_mx3_camera( pdev =platform_device_alloc ("mx3-camera" ,0 );if (!pdev) - goto err; +return ERR_PTR (-ENOMEM ); pdev->dev.dma_mask =kmalloc (sizeof (*pdev->dev.dma_mask),GFP_KERNEL );if (!pdev->dev.dma_mask)
arch/arm/mach-omap2/board-flash.c +1 -1
@@ -142,7 +142,7 @@ __init board_nand_init(struct mtd_partition *nand_parts, u8 nr_parts, u8 cs, board_nand_data.nr_parts = nr_parts; board_nand_data.devsize = nand_type; - board_nand_data.ecc_opt =OMAP_ECC_BCH8_CODE_HW ; + board_nand_data.ecc_opt =OMAP_ECC_HAM1_CODE_HW ; gpmc_nand_init(&board_nand_data, gpmc_t); }#endif /* CONFIG_MTD_NAND_OMAP2 || CONFIG_MTD_NAND_OMAP2_MODULE */
arch/arm/mach-omap2/cclock3xxx_data.c +2 -1
@@ -456,7 +456,8 @@ static struct clk_hw_omap dpll4_m5x2_ck_hw = { .clkdm_name = "dpll4_clkdm", }; -DEFINE_STRUCT_CLK (dpll4_m5x2_ck, dpll4_m5x2_ck_parent_names, dpll4_m5x2_ck_ops); +DEFINE_STRUCT_CLK_FLAGS (dpll4_m5x2_ck, dpll4_m5x2_ck_parent_names, + dpll4_m5x2_ck_ops,CLK_SET_RATE_PARENT );static struct clk dpll4_m5x2_ck_3630 = { .name ="dpll4_m5x2_ck" ,
arch/arm/mach-omap2/cpuidle44xx.c +21 -4
@@ -14,6 +14,7 @@#include <linux/cpuidle.h> #include <linux/cpu_pm.h> #include <linux/export.h> +#include <linux/clockchips.h> #include <asm/cpuidle.h> #include <asm/proc-fns.h>
@@ -83,6 +84,7 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev, {struct idle_statedata *cx = state_ptr + index;u32 mpuss_can_lose_context =0 ; +int cpu_id =smp_processor_id ();/* * CPU0 has to wait and stay ON until CPU1 is OFF state.
@@ -110,6 +112,8 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev, mpuss_can_lose_context = (cx->mpu_state ==PWRDM_POWER_RET ) && (cx->mpu_logic_state ==PWRDM_POWER_OFF ); +clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_ENTER , &cpu_id); +/* * Call idle CPU PM enter notifier chain so that * VFP and per CPU interrupt context is saved.
@@ -165,6 +169,8 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev,if (dev->cpu ==0 && mpuss_can_lose_context)cpu_cluster_pm_exit (); +clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_EXIT , &cpu_id); + fail:cpuidle_coupled_parallel_barrier (dev, &abort_barrier); cpu_done[dev->cpu] = false;
@@ -172,6 +178,16 @@ fail:return index; } +/* +* For each cpu, setup the broadcast timer because local timers +* stops for the states above C1. +*/ +static void omap_setup_broadcast_timer (void *arg) +{ +int cpu =smp_processor_id (); +clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_ON , &cpu); +} +static struct cpuidle_driver omap4_idle_driver = { .name ="omap4_idle" , .owner =THIS_MODULE ,
@@ -189,8 +205,7 @@ static struct cpuidle_driver omap4_idle_driver = {/* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */ .exit_latency = 328 + 440, .target_residency = 960, - .flags =CPUIDLE_FLAG_TIME_VALID |CPUIDLE_FLAG_COUPLED | - CPUIDLE_FLAG_TIMER_STOP, + .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED, .enter = omap_enter_idle_coupled, .name = "C2", .desc = "CPUx OFF, MPUSS CSWR",
@@ -199,8 +214,7 @@ static struct cpuidle_driver omap4_idle_driver = {/* C3 - CPU0 OFF + CPU1 OFF + MPU OSWR */ .exit_latency = 460 + 518, .target_residency = 1100, - .flags =CPUIDLE_FLAG_TIME_VALID |CPUIDLE_FLAG_COUPLED | - CPUIDLE_FLAG_TIMER_STOP, + .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED, .enter = omap_enter_idle_coupled, .name = "C3", .desc = "CPUx OFF, MPUSS OSWR",
@@ -231,5 +245,8 @@ int __init omap4_idle_init(void)if (!cpu_clkdm[0 ] || !cpu_clkdm[1 ])return -ENODEV ; +/* Configure the broadcast timer on each cpu */ +on_each_cpu (omap_setup_broadcast_timer,NULL ,1 ); +return cpuidle_register (&omap4_idle_driver, cpu_online_mask); }
arch/arm/mach-omap2/omap_hwmod_54xx_data.c +1 -1
@@ -895,7 +895,7 @@ static struct omap_hwmod omap54xx_mcpdm_hwmod = {* current exception. */ - .flags = HWMOD_EXT_OPT_MAIN_CLK, + .flags = HWMOD_EXT_OPT_MAIN_CLK | HWMOD_SWSUP_SIDLE, .main_clk = "pad_clks_ck", .prcm = { .omap4 = {
arch/mips/kernel/traps.c +2 -2
@@ -1429,7 +1429,7 @@ asmlinkage void cache_parity_error(void) reg_val & (1 <<30 ) ?"secondary" :"primary" , reg_val & (1<<31) ? "data" : "insn");if (cpu_has_mips_r2 && - ((current_cpu_data.processor_id &&0xff0000 ) ==PRID_COMP_MIPS )) { + ((current_cpu_data.processor_id &0xff0000 ) ==PRID_COMP_MIPS )) { pr_err("Error bits: %s%s%s%s%s%s%s%s\n", reg_val & (1<<29) ? "ED " : "", reg_val & (1<<28) ? "ET " : "",
@@ -1469,7 +1469,7 @@ asmlinkage void do_ftlb(void)/* For the moment, report the problem and hang. */ if (cpu_has_mips_r2 && - ((current_cpu_data.processor_id &&0xff0000 ) ==PRID_COMP_MIPS )) { + ((current_cpu_data.processor_id &0xff0000 ) ==PRID_COMP_MIPS )) {pr_err ("FTLB error exception, cp0_ecc=0x%08x:\n" ,read_c0_ecc ());pr_err ("cp0_errorepc == %0*lx\n" , field,read_c0_errorepc ());
drivers/ata/libata-core.c +4 -4
@@ -4224,10 +4224,10 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "PIONEER DVD-RW DVR-216D", NULL, ATA_HORKAGE_NOSETXFER },/* devices that don't properly handle queued TRIM commands */ - { "Micron_M500*", "MU0[1-4]*", ATA_HORKAGE_NO_NCQ_TRIM, }, - { "Crucial_CT???M500SSD*", "MU0[1-4]*", ATA_HORKAGE_NO_NCQ_TRIM, }, - { "Micron_M550*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, - { "Crucial_CT???M550SSD*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, + { "Micron_M500*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, + { "Crucial_CT???M500SSD*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, + { "Micron_M550*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, + { "Crucial_CT???M550SSD*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, },/* * Some WD SATA-I drives spin up and down erratically when the link
drivers/block/virtio_blk.c +2 -2
@@ -144,11 +144,11 @@ static void virtblk_done(struct virtqueue *vq)if (unlikely (virtqueue_is_broken (vq)))break ; }while (!virtqueue_enable_cb (vq)); -spin_unlock_irqrestore (&vblk->vq_lock, flags);/* In case queue is stopped waiting for more buffers. */ if (req_done)blk_mq_start_stopped_hw_queues (vblk->disk->queue); +spin_unlock_irqrestore (&vblk->vq_lock, flags); }static int virtio_queue_rq (struct blk_mq_hw_ctx *hctx,struct request *req)
@@ -200,8 +200,8 @@ static int virtio_queue_rq(struct blk_mq_hw_ctx *hctx, struct request *req)spin_lock_irqsave (&vblk->vq_lock, flags);if (__virtblk_add_req (vblk->vq, vbr, vbr->sg, num) <0 ) {virtqueue_kick (vblk->vq); -spin_unlock_irqrestore (&vblk->vq_lock, flags);blk_mq_stop_hw_queue (hctx); +spin_unlock_irqrestore (&vblk->vq_lock, flags);return BLK_MQ_RQ_QUEUE_BUSY ; }
drivers/cpufreq/cpufreq-cpu0.c +11 -5
@@ -131,7 +131,7 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev)return -ENOENT ; } - cpu_reg =devm_regulator_get_optional (cpu_dev,"cpu0" ); + cpu_reg =regulator_get_optional (cpu_dev,"cpu0" );if (IS_ERR (cpu_reg)) {/* * If cpu0 regulator supply node is present, but regulator is
@@ -146,23 +146,23 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) PTR_ERR(cpu_reg)); } - cpu_clk =devm_clk_get (cpu_dev,NULL ); + cpu_clk =clk_get (cpu_dev,NULL );if (IS_ERR (cpu_clk)) { ret =PTR_ERR (cpu_clk);pr_err ("failed to get cpu0 clock: %d\n" , ret); - goto out_put_node; + goto out_put_reg; } ret =of_init_opp_table (cpu_dev);if (ret) {pr_err ("failed to init OPP table: %d\n" , ret); - goto out_put_node; + goto out_put_clk; } ret =dev_pm_opp_init_cpufreq_table (cpu_dev, &freq_table);if (ret) {pr_err ("failed to init cpufreq table: %d\n" , ret); - goto out_put_node; + goto out_put_clk; }of_property_read_u32 (np,"voltage-tolerance" , &voltage_tolerance);
@@ -217,6 +217,12 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) out_free_table:dev_pm_opp_free_cpufreq_table (cpu_dev, &freq_table); +out_put_clk: +if (!IS_ERR (cpu_clk)) +clk_put (cpu_clk); +out_put_reg: +if (!IS_ERR (cpu_reg)) +regulator_put (cpu_reg); out_put_node:of_node_put (np);return ret;
drivers/cpufreq/cpufreq_governor.c +6 -0
@@ -366,6 +366,11 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,break ;case CPUFREQ_GOV_LIMITS : +mutex_lock (&dbs_data->mutex); +if (!cpu_cdbs->cur_policy) { +mutex_unlock (&dbs_data->mutex); +break ; + }mutex_lock (&cpu_cdbs->timer_mutex);if (policy->max < cpu_cdbs->cur_policy->cur) __cpufreq_driver_target(cpu_cdbs->cur_policy,
@@ -375,6 +380,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy, policy->min, CPUFREQ_RELATION_L);dbs_check_cpu (dbs_data, cpu);mutex_unlock (&cpu_cdbs->timer_mutex); +mutex_unlock (&dbs_data->mutex);break ; }return 0 ;
drivers/cpufreq/intel_pstate.c +40 -32
151 lines not on this page · raw message
drivers/firewire/core.h +2 -2
@@ -237,8 +237,8 @@ static inline bool is_next_generation(int new_generation, int old_generation)#define LOCAL_BUS 0xffc0 -/* arbitrarily chosen maximum range for physical DMA: 128 TB */ -#define FW_MAX_PHYSICAL_RANGE (128ULL << 40) +/* OHCI-1394's default upper bound for physical DMA: 4 GB */ +#define FW_MAX_PHYSICAL_RANGE (1ULL << 32)void fw_core_handle_request (struct fw_card *card,struct fw_packet *request);void fw_core_handle_response (struct fw_card *card,struct fw_packet *packet);
drivers/firewire/ohci.c +1 -1
@@ -3716,7 +3716,7 @@ static int pci_probe(struct pci_dev *dev, version >>16 , version &0xff , ohci->card.index, ohci->n_ir, ohci->n_it, ohci->quirks,reg_read (ohci, OHCI1394_PhyUpperBound) ? - ", >4 GB phys DMA" : ""); + ", physUB" : "");return 0 ;
drivers/gpio/gpio-mcp23s08.c +7 -4
@@ -895,8 +895,11 @@ static int mcp23s08_probe(struct spi_device *spi)return -ENODEV ; } -for (addr =0 ; addr <ARRAY_SIZE (pdata->chip); addr++) +for (addr =0 ; addr <ARRAY_SIZE (pdata->chip); addr++) { pullups[addr] =0 ; +if (spi_present_mask & (1 << addr)) + chips++; + } }else { type =spi_get_device_id (spi)->driver_data; pdata =dev_get_platdata (&spi->dev);
@@ -919,12 +922,12 @@ static int mcp23s08_probe(struct spi_device *spi) pullups[addr] = pdata->chip[addr].pullups; } -if (!chips) -return -ENODEV ; - base = pdata->base; } +if (!chips) +return -ENODEV ; + data =kzalloc (sizeof *data + chips *sizeof (struct mcp23s08 ),GFP_KERNEL );if (!data)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -2426,6 +2426,7 @@ extern void intel_modeset_suspend_hw(struct drm_device *dev);extern void intel_modeset_init (struct drm_device *dev);extern void intel_modeset_gem_init (struct drm_device *dev);extern void intel_modeset_cleanup (struct drm_device *dev); +extern void intel_connector_unregister (struct intel_connector *);extern int intel_modeset_vga_set_state (struct drm_device *dev,bool state);extern void intel_modeset_setup_hw_state (struct drm_device *dev,bool force_restore);
drivers/gpu/drm/i915/i915_gem_execbuffer.c +32 -22
73 lines not on this page · raw message
drivers/gpu/drm/i915/intel_crt.c +1 -0
@@ -841,6 +841,7 @@ void intel_crt_init(struct drm_device *dev) crt->base.get_hw_state = intel_crt_get_hw_state; } intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_connector->unregister = intel_connector_unregister;drm_connector_helper_add (connector, &intel_crt_connector_helper_funcs);
drivers/gpu/drm/i915/intel_display.c +12 -2
@@ -11368,6 +11368,14 @@ void intel_modeset_gem_init(struct drm_device *dev)mutex_unlock (&dev->mode_config.mutex); } +void intel_connector_unregister (struct intel_connector *intel_connector) +{ +struct drm_connector *connector = &intel_connector->base; + +intel_panel_destroy_backlight (connector); +drm_sysfs_connector_remove (connector); +} +void intel_modeset_cleanup (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -11412,8 +11420,10 @@ void intel_modeset_cleanup(struct drm_device *dev)/* destroy the backlight and sysfs files before encoders/connectors */ list_for_each_entry (connector, &dev->mode_config.connector_list, head) { -intel_panel_destroy_backlight (connector); -drm_sysfs_connector_remove (connector); +struct intel_connector *intel_connector; + + intel_connector =to_intel_connector (connector); + intel_connector->unregister (intel_connector); }drm_mode_config_cleanup (dev);
drivers/gpu/drm/i915/intel_dp.c +22 -1
@@ -744,6 +744,16 @@ out:return ret; } +static void +intel_dp_connector_unregister (struct intel_connector *intel_connector) +{ +struct intel_dp *intel_dp =intel_attached_dp (&intel_connector->base); + +sysfs_remove_link (&intel_connector->base.kdev->kobj, + intel_dp->adapter.dev.kobj.name); +intel_connector_unregister (intel_connector); +} +static int intel_dp_i2c_init (struct intel_dp *intel_dp,struct intel_connector *intel_connector,const char *name)
@@ -761,9 +771,19 @@ intel_dp_i2c_init(struct intel_dp *intel_dp,strncpy (intel_dp->adapter.name, name,sizeof (intel_dp->adapter.name) -1 ); intel_dp->adapter.name[sizeof (intel_dp->adapter.name) -1 ] ='\0' ; intel_dp->adapter.algo_data = &intel_dp->algo; - intel_dp->adapter.dev.parent = intel_connector->base.kdev; + intel_dp->adapter.dev.parent = intel_connector->base.dev->dev; ret =i2c_dp_aux_add_bus (&intel_dp->adapter); +if (ret <0 ) +return ret; + + ret =sysfs_create_link (&intel_connector->base.kdev->kobj, + &intel_dp->adapter.dev.kobj, + intel_dp->adapter.dev.kobj.name); + +if (ret <0 ) +i2c_del_adapter (&intel_dp->adapter); +return ret; }
@@ -3686,6 +3706,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, intel_connector->get_hw_state = intel_ddi_connector_get_hw_state; else intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_connector->unregister = intel_dp_connector_unregister; intel_dp->aux_ch_ctl_reg = intel_dp->output_reg +0x10 ;if (HAS_DDI (dev)) {
drivers/gpu/drm/i915/intel_drv.h +8 -0
@@ -187,6 +187,14 @@ struct intel_connector {* and active (i.e. dpms ON state). */ bool (*get_hw_state)(struct intel_connector *); +/* +* Removes all interfaces through which the connector is accessible +* - like sysfs, debugfs entries -, so that no new operations can be +* started on the connector. Also makes sure all currently pending +* operations finish before returing. +*/ +void (*unregister)(struct intel_connector *); +/* Panel info for eDP and LVDS */ struct intel_panel panel;
drivers/gpu/drm/i915/intel_dsi.c +1 -0
@@ -586,6 +586,7 @@ bool intel_dsi_init(struct drm_device *dev) intel_encoder->get_config = intel_dsi_get_config; intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_connector->unregister = intel_connector_unregister;for (i =0 ; i <ARRAY_SIZE (intel_dsi_devices); i++) { dsi = &intel_dsi_devices[i];
drivers/gpu/drm/i915/intel_dvo.c +1 -0
@@ -477,6 +477,7 @@ void intel_dvo_init(struct drm_device *dev) intel_encoder->compute_config = intel_dvo_compute_config; intel_encoder->mode_set = intel_dvo_mode_set; intel_connector->get_hw_state = intel_dvo_connector_get_hw_state; + intel_connector->unregister = intel_connector_unregister;/* Now, try to find a controller */ for (i =0 ; i <ARRAY_SIZE (intel_dvo_devices); i++) {
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
@@ -1262,6 +1262,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, intel_connector->get_hw_state = intel_ddi_connector_get_hw_state; else intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_connector->unregister = intel_connector_unregister;intel_hdmi_add_properties (intel_hdmi, connector);
drivers/gpu/drm/i915/intel_lvds.c +1 -0
@@ -957,6 +957,7 @@ void intel_lvds_init(struct drm_device *dev) intel_encoder->get_hw_state = intel_lvds_get_hw_state; intel_encoder->get_config = intel_lvds_get_config; intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_connector->unregister = intel_connector_unregister;intel_connector_attach_encoder (intel_connector, intel_encoder); intel_encoder->type =INTEL_OUTPUT_LVDS ;
drivers/gpu/drm/i915/intel_sdvo.c +1 -0
@@ -2397,6 +2397,7 @@ intel_sdvo_connector_init(struct intel_sdvo_connector *connector, connector->base.base.doublescan_allowed =0 ; connector->base.base.display_info.subpixel_order = SubPixelHorizontalRGB; connector->base.get_hw_state = intel_sdvo_connector_get_hw_state; + connector->base.unregister = intel_connector_unregister;intel_connector_attach_encoder (&connector->base, &encoder->base);drm_sysfs_connector_add (&connector->base.base);
drivers/gpu/drm/i915/intel_tv.c +1 -0
@@ -1639,6 +1639,7 @@ intel_tv_init(struct drm_device *dev) intel_encoder->disable = intel_disable_tv; intel_encoder->get_hw_state = intel_tv_get_hw_state; intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_connector->unregister = intel_connector_unregister;intel_connector_attach_encoder (intel_connector, intel_encoder); intel_encoder->type =INTEL_OUTPUT_TVOUT ;
drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c +1 -1
@@ -732,7 +732,7 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, }if (outp ==8 ) -return false; +return conf; data =exec_lookup (priv, head, outp, ctrl, dcb, &ver, &hdr, &cnt, &len, &info1);if (data ==0x0000 )
drivers/gpu/drm/radeon/atombios_crtc.c +2 -4
@@ -270,8 +270,6 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)switch (mode) {case DRM_MODE_DPMS_ON : radeon_crtc->enabled = true; -/* adjust pm to dpms changes BEFORE enabling crtcs */ -radeon_pm_compute_clocks (rdev);atombios_enable_crtc (crtc,ATOM_ENABLE );if (ASIC_IS_DCE3 (rdev) && !ASIC_IS_DCE6 (rdev))atombios_enable_crtc_memreq (crtc,ATOM_ENABLE );
@@ -289,10 +287,10 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)atombios_enable_crtc_memreq (crtc,ATOM_DISABLE );atombios_enable_crtc (crtc,ATOM_DISABLE ); radeon_crtc->enabled = false; -/* adjust pm to dpms changes AFTER disabling crtcs */ -radeon_pm_compute_clocks (rdev);break ; } +/* adjust pm to dpms */ +radeon_pm_compute_clocks (rdev); } static void
drivers/gpu/drm/radeon/radeon_asic.c +2 -2
@@ -2034,8 +2034,8 @@ static struct radeon_asic ci_asic = { .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX, .dma = &cik_copy_dma, .dma_ring_index = R600_RING_TYPE_DMA_INDEX, - .copy = &cik_copy_dma, - .copy_ring_index = R600_RING_TYPE_DMA_INDEX, + .copy = &cik_copy_cpdma, + .copy_ring_index = RADEON_RING_TYPE_GFX_INDEX, }, .surface = { .set_reg = r600_set_surface_reg,
drivers/gpu/drm/radeon/radeon_bios.c +14 -0
@@ -196,6 +196,20 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev) } } +if (!found) { +while ((pdev =pci_get_class (PCI_CLASS_DISPLAY_OTHER <<8 , pdev)) !=NULL ) { + dhandle =ACPI_HANDLE (&pdev->dev); +if (!dhandle) +continue ; + + status =acpi_get_handle (dhandle,"ATRM" , &atrm_handle); +if (!ACPI_FAILURE (status)) { + found = true; +break ; + } + } + } +if (!found)return false;
drivers/gpu/drm/radeon/radeon_cs.c +11 -4
@@ -276,10 +276,17 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data)return -EINVAL ;/* we only support VM on some SI+ rings */ -if ((p->rdev->asic->ring[p->ring]->cs_parse ==NULL ) && - ((p->cs_flags &RADEON_CS_USE_VM ) ==0 )) { -DRM_ERROR ("Ring %d requires VM!\n" , p->ring); -return -EINVAL ; +if ((p->cs_flags &RADEON_CS_USE_VM ) ==0 ) { +if (p->rdev->asic->ring[p->ring]->cs_parse ==NULL ) { +DRM_ERROR ("Ring %d requires VM!\n" , p->ring); +return -EINVAL ; + } + }else { +if (p->rdev->asic->ring[p->ring]->ib_parse ==NULL ) { +DRM_ERROR ("VM not supported on ring %d!\n" , + p->ring); +return -EINVAL ; + } } }
drivers/gpu/drm/radeon/radeon_device.c +4 -0
@@ -1536,6 +1536,10 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon)radeon_restore_bios_scratch_regs (rdev); +/* set the power state here in case we are a PX system or headless */ +if ((rdev->pm.pm_method ==PM_METHOD_DPM ) && rdev->pm.dpm_enabled) +radeon_pm_compute_clocks (rdev); +if (fbcon) {radeon_fbdev_set_suspend (rdev,0 );console_unlock ();
drivers/gpu/drm/radeon/radeon_object.c +23 -15
@@ -586,22 +586,30 @@ int radeon_bo_fault_reserve_notify(struct ttm_buffer_object *bo) rbo = container_of(bo, struct radeon_bo, tbo);radeon_bo_check_tiling (rbo,0 ,0 ); rdev = rbo->rdev; -if (bo->mem.mem_type ==TTM_PL_VRAM ) { - size = bo->mem.num_pages <<PAGE_SHIFT ; - offset = bo->mem.start <<PAGE_SHIFT ; -if ((offset + size) > rdev->mc.visible_vram_size) { -/* hurrah the memory is not visible ! */ -radeon_ttm_placement_from_domain (rbo,RADEON_GEM_DOMAIN_VRAM ); - rbo->placement.lpfn = rdev->mc.visible_vram_size >>PAGE_SHIFT ; - r =ttm_bo_validate (bo, &rbo->placement, false, false); -if (unlikely (r !=0 )) -return r; - offset = bo->mem.start <<PAGE_SHIFT ; -/* this should not happen */ -if ((offset + size) > rdev->mc.visible_vram_size) -return -EINVAL ; - } +if (bo->mem.mem_type !=TTM_PL_VRAM ) +return 0 ; + + size = bo->mem.num_pages <<PAGE_SHIFT ; + offset = bo->mem.start <<PAGE_SHIFT ; +if ((offset + size) <= rdev->mc.visible_vram_size) +return 0 ; + +/* hurrah the memory is not visible ! */ +radeon_ttm_placement_from_domain (rbo,RADEON_GEM_DOMAIN_VRAM ); + rbo->placement.lpfn = rdev->mc.visible_vram_size >>PAGE_SHIFT ; + r =ttm_bo_validate (bo, &rbo->placement, false, false); +if (unlikely (r == -ENOMEM )) { +radeon_ttm_placement_from_domain (rbo,RADEON_GEM_DOMAIN_GTT ); +return ttm_bo_validate (bo, &rbo->placement, false, false); + }else if (unlikely (r !=0 )) { +return r; } + + offset = bo->mem.start <<PAGE_SHIFT ; +/* this should never happen */ +if ((offset + size) > rdev->mc.visible_vram_size) +return -EINVAL ; +return 0 ; }
drivers/gpu/drm/radeon/radeon_pm.c +41 -2
100 lines not on this page · raw message
drivers/gpu/drm/radeon/sid.h +2 -2
@@ -107,8 +107,8 @@#define SPLL_CHG_STATUS (1 << 1)#define SPLL_CNTL_MODE 0x618#define SPLL_SW_DIR_CONTROL (1 << 0) -# define SPLL_REFCLK_SEL (x) ((x) << 8) -# define SPLL_REFCLK_SEL_MASK 0xFF00 +# define SPLL_REFCLK_SEL (x) ((x) << 26) +# define SPLL_REFCLK_SEL_MASK (3 << 26)#define CG_SPLL_SPREAD_SPECTRUM 0x620#define SSEN (1 << 0)
drivers/hwmon/Kconfig +1 -1
@@ -971,7 +971,7 @@ config SENSORS_NCT6775 config SENSORS_NTC_THERMISTOR tristate "NTC thermistor support" - depends on (!OF && !IIO) || (OF && IIO) + depends on !OF || IIO=n || IIO help This driver supports NTC thermistors sensor reading and its interpretation. The driver can also monitor the temperature and
drivers/hwmon/ntc_thermistor.c +9 -6
@@ -44,6 +44,7 @@ struct ntc_compensation {unsigned int ohm; }; +/* Order matters, ntc_match references the entries by index */ static const struct platform_device_id ntc_thermistor_id[] = { {"ncp15wb473" ,TYPE_NCPXXWB473 }, {"ncp18wb473" ,TYPE_NCPXXWB473 },
@@ -141,7 +142,7 @@ struct ntc_data {char name[PLATFORM_NAME_SIZE ]; }; -#ifdef CONFIG_OF +#if defined(CONFIG_OF ) &&IS_ENABLED (CONFIG_IIO )static int ntc_adc_iio_read (struct ntc_thermistor_platform_data *pdata) {struct iio_channel *channel = pdata->chan;
@@ -163,15 +164,15 @@ static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata)static const struct of_device_id ntc_match[] = { { .compatible ="ntc,ncp15wb473" , - .data = &ntc_thermistor_id[TYPE_NCPXXWB473 ] }, + .data = &ntc_thermistor_id[0 ] }, { .compatible ="ntc,ncp18wb473" , - .data = &ntc_thermistor_id[TYPE_NCPXXWB473 ] }, + .data = &ntc_thermistor_id[1 ] }, { .compatible ="ntc,ncp21wb473" , - .data = &ntc_thermistor_id[TYPE_NCPXXWB473 ] }, + .data = &ntc_thermistor_id[2 ] }, { .compatible ="ntc,ncp03wb473" , - .data = &ntc_thermistor_id[TYPE_NCPXXWB473 ] }, + .data = &ntc_thermistor_id[3 ] }, { .compatible ="ntc,ncp15wl333" , - .data = &ntc_thermistor_id[TYPE_NCPXXWL333 ] }, + .data = &ntc_thermistor_id[4 ] }, { }, };MODULE_DEVICE_TABLE (of, ntc_match);
@@ -223,6 +224,8 @@ ntc_thermistor_parse_dt(struct platform_device *pdev) return NULL; } +#define ntc_match NULL +static void ntc_iio_channel_release (struct ntc_thermistor_platform_data *pdata) { }#endif
drivers/infiniband/ulp/isert/ib_isert.c +2 -0
@@ -1117,6 +1117,8 @@ sequence_cmd:if (!rc && dump_payload == false && unsol_data)iscsit_set_unsoliticed_dataout (cmd); +else if (dump_payload && imm_data) +target_put_sess_cmd (conn->sess->se_sess, &cmd->se_cmd);return 0 ; }
drivers/iommu/intel-iommu.c +17 -1
@@ -4075,7 +4075,7 @@ static size_t intel_iommu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size) {struct dmar_domain *dmar_domain = domain->priv; -int order; +int order, iommu_id; order =dma_pte_clear_range (dmar_domain, iova >>VTD_PAGE_SHIFT , (iova + size -1 ) >>VTD_PAGE_SHIFT );
@@ -4083,6 +4083,22 @@ static size_t intel_iommu_unmap(struct iommu_domain *domain,if (dmar_domain->max_addr == iova + size) dmar_domain->max_addr = iova; +for_each_set_bit (iommu_id, dmar_domain->iommu_bmp, g_num_of_iommus) { +struct intel_iommu *iommu = g_iommus[iommu_id]; +int num, ndomains; + +/* +* find bit position of dmar_domain +*/ + ndomains =cap_ndoms (iommu->cap); +for_each_set_bit (num, iommu->domain_ids, ndomains) { +if (iommu->domains[num] == dmar_domain) +iommu_flush_iotlb_psi (iommu, num, + iova >>VTD_PAGE_SHIFT , +1 << order,0 ); + } + } +return PAGE_SIZE << order; }
drivers/md/dm-cache-target.c +2 -0
@@ -2195,6 +2195,8 @@ static int cache_create(struct cache_args *ca, struct cache **result) ti->num_discard_bios =1 ; ti->discards_supported = true; ti->discard_zeroes_data_unsupported = true; +/* Discard bios must be split on a block boundary */ + ti->split_discard_bios = true; cache->features = ca->features; ti->per_bio_data_size =get_per_bio_data_size (cache);
drivers/md/dm-thin.c +9 -3
@@ -25,7 +25,9 @@#define MAPPING_POOL_SIZE 1024#define PRISON_CELLS 1024#define COMMIT_PERIOD HZ -#define NO_SPACE_TIMEOUT (HZ * 60) +#define NO_SPACE_TIMEOUT_SECS 60 + +static unsigned no_space_timeout_secs =NO_SPACE_TIMEOUT_SECS ;DECLARE_DM_KCOPYD_THROTTLE_WITH_MODULE_PARM (snapshot_copy_throttle,"A percentage of time allocated for copy on write" );
@@ -1529,6 +1531,7 @@ static void set_pool_mode(struct pool *pool, enum pool_mode new_mode)struct pool_c *pt = pool->ti->private;bool needs_check =dm_pool_metadata_needs_check (pool->pmd);enum pool_mode old_mode =get_pool_mode (pool); +unsigned long no_space_timeout =ACCESS_ONCE (no_space_timeout_secs) *HZ ;/* * Never allow the pool to transition to PM_WRITE mode if user
@@ -1591,8 +1594,8 @@ static void set_pool_mode(struct pool *pool, enum pool_mode new_mode) pool->process_prepared_mapping = process_prepared_mapping; pool->process_prepared_discard = process_prepared_discard_passdown; -if (!pool->pf.error_if_no_space) -queue_delayed_work (pool->wq, &pool->no_space_timeout,NO_SPACE_TIMEOUT ); +if (!pool->pf.error_if_no_space && no_space_timeout) +queue_delayed_work (pool->wq, &pool->no_space_timeout, no_space_timeout);break ;case PM_WRITE :
@@ -3326,6 +3329,9 @@ static void dm_thin_exit(void)module_init (dm_thin_init);module_exit (dm_thin_exit); +module_param_named (no_space_timeout, no_space_timeout_secs, uint,S_IRUGO |S_IWUSR ); +MODULE_PARM_DESC (no_space_timeout,"Out of data space queue IO timeout in seconds" ); +MODULE_DESCRIPTION (DM_NAME " thin provisioning target" );MODULE_AUTHOR ("Joe Thornber <[email protected]>" );MODULE_LICENSE ("GPL" );
drivers/md/md.c +4 -1
@@ -7395,8 +7395,10 @@ void md_do_sync(struct md_thread *thread)/* just incase thread restarts... */ if (test_bit (MD_RECOVERY_DONE , &mddev->recovery))return ; -if (mddev->ro)/* never try to sync a read-only array */ +if (mddev->ro) {/* never try to sync a read-only array */ +set_bit (MD_RECOVERY_INTR , &mddev->recovery);return ; + }if (test_bit (MD_RECOVERY_SYNC , &mddev->recovery)) {if (test_bit (MD_RECOVERY_CHECK , &mddev->recovery)) {
@@ -7838,6 +7840,7 @@ void md_check_recovery(struct mddev *mddev)/* There is no thread, but we need to call * ->spare_active and clear saved_raid_disk */ +set_bit (MD_RECOVERY_INTR , &mddev->recovery);md_reap_sync_thread (mddev);clear_bit (MD_RECOVERY_NEEDED , &mddev->recovery); goto unlock;
drivers/scsi/scsi_transport_sas.c +1 -2
@@ -1621,8 +1621,6 @@ void sas_rphy_free(struct sas_rphy *rphy)list_del (&rphy->list);mutex_unlock (&sas_host->lock); -sas_bsg_remove (shost, rphy); -transport_destroy_device (dev);put_device (dev);
@@ -1681,6 +1679,7 @@ sas_rphy_remove(struct sas_rphy *rphy) }sas_rphy_unlink (rphy); +sas_bsg_remove (NULL , rphy);transport_remove_device (dev);device_del (dev); }
drivers/staging/comedi/drivers/ni_daq_700.c +2 -0
@@ -122,6 +122,8 @@ static int daq700_ai_rinsn(struct comedi_device *dev,/* write channel to multiplexer */ /* set mask scan bit high to disable scanning */ outb (chan |0x80 , dev->iobase +CMD_R1 ); +/* mux needs 2us to really settle [Fred Brooks]. */ +udelay (2 );/* convert n samples */ for (n =0 ; n < insn->n; n++) {
drivers/staging/rtl8192e/rtllib_tx.c +1 -1
@@ -171,7 +171,7 @@ inline int rtllib_put_snap(u8 *data, u16 h_proto) snap->oui[1 ] = oui[1 ]; snap->oui[2 ] = oui[2 ]; - *(u16 *)(data +SNAP_SIZE ) = h_proto; + *(__be16 *)(data +SNAP_SIZE ) =htons (h_proto);return SNAP_SIZE +sizeof (u16); }
drivers/staging/speakup/main.c +1 -0
@@ -2218,6 +2218,7 @@ static void __exit speakup_exit(void)unregister_keyboard_notifier (&keyboard_notifier_block);unregister_vt_notifier (&vt_notifier_block);speakup_unregister_devsynth (); +speakup_cancel_paste ();del_timer (&cursor_timer);kthread_stop (speakup_task); speakup_task =NULL ;
drivers/staging/speakup/selection.c +43 -9
80 lines not on this page · raw message
drivers/staging/speakup/speakup.h +1 -0
@@ -77,6 +77,7 @@ extern void synth_buffer_clear(void);extern void speakup_clear_selection (void );extern int speakup_set_selection (struct tty_struct *tty);extern int speakup_paste_selection (struct tty_struct *tty); +extern void speakup_cancel_paste (void );extern void speakup_register_devsynth (void );extern void speakup_unregister_devsynth (void );extern void synth_write (const char *buf,size_t count);
drivers/target/iscsi/iscsi_target_login.c +28 -29
104 lines not on this page · raw message
drivers/target/target_core_configfs.c +5 -0
@@ -2223,6 +2223,11 @@ static ssize_t target_core_alua_tg_pt_gp_store_attr_alua_access_state( " tg_pt_gp ID: %hu\n", tg_pt_gp->tg_pt_gp_valid_id);return -EINVAL ; } +if (!(dev->dev_flags &DF_CONFIGURED )) { +pr_err ("Unable to set alua_access_state while device is" +" not configured\n" ); +return -ENODEV ; + } ret =kstrtoul (page,0 , &tmp);if (ret <0 ) {
drivers/tty/tty_buffer.c +2 -0
@@ -60,6 +60,7 @@ void tty_buffer_lock_exclusive(struct tty_port *port)atomic_inc (&buf->priority);mutex_lock (&buf->lock); } +EXPORT_SYMBOL_GPL (tty_buffer_lock_exclusive);void tty_buffer_unlock_exclusive (struct tty_port *port) {
@@ -73,6 +74,7 @@ void tty_buffer_unlock_exclusive(struct tty_port *port)if (restart)queue_work (system_unbound_wq, &buf->work); } +EXPORT_SYMBOL_GPL (tty_buffer_unlock_exclusive);/** * tty_buffer_space_avail - return unused buffer space
drivers/usb/core/driver.c +6 -3
@@ -1801,10 +1801,13 @@ int usb_runtime_suspend(struct device *dev)if (status == -EAGAIN || status == -EBUSY )usb_mark_last_busy (udev); -/* The PM core reacts badly unless the return code is 0, -* -EAGAIN, or -EBUSY, so always return -EBUSY on an error. +/* +* The PM core reacts badly unless the return code is 0, +* -EAGAIN, or -EBUSY, so always return -EBUSY on an error +* (except for root hubs, because they don't suspend through +* an upstream port like other USB devices). */ -if (status !=0 ) +if (status !=0 && udev->parent)return -EBUSY ;return status; }
drivers/usb/core/hub.c +13 -2
@@ -1679,8 +1679,19 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)*/ pm_runtime_set_autosuspend_delay (&hdev->dev,0 ); -/* Hubs have proper suspend/resume support. */ -usb_enable_autosuspend (hdev); +/* +* Hubs have proper suspend/resume support, except for root hubs +* where the controller driver doesn't have bus_suspend and +* bus_resume methods. +*/ +if (hdev->parent) {/* normal device */ +usb_enable_autosuspend (hdev); + }else {/* root hub */ +const struct hc_driver *drv =bus_to_hcd (hdev->bus)->driver; + +if (drv->bus_suspend && drv->bus_resume) +usb_enable_autosuspend (hdev); + }if (hdev->level ==MAX_TOPO_LEVEL ) { dev_err(&intf->dev,
drivers/usb/host/pci-quirks.c +7 -0
@@ -847,6 +847,13 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev)bool ehci_found = false;struct pci_dev *companion =NULL ; +/* Sony VAIO t-series with subsystem device ID 90a8 is not capable of +* switching ports from EHCI to xHCI +*/ +if (xhci_pdev->subsystem_vendor ==PCI_VENDOR_ID_SONY && + xhci_pdev->subsystem_device ==0x90a8 ) +return ; +/* make sure an intel EHCI controller exists */ for_each_pci_dev (companion) { if (companion->class == PCI_CLASS_SERIAL_USB_EHCI &&
drivers/usb/host/xhci-mem.c +10 -10
@@ -1722,6 +1722,16 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci)kfree (cur_cd); } + num_ports =HCS_MAX_PORTS (xhci->hcs_params1); +for (i =0 ; i < num_ports; i++) { +struct xhci_interval_bw_table *bwt = &xhci->rh_bw[i].bw_table; +for (j =0 ; j <XHCI_MAX_INTERVAL ; j++) { +struct list_head *ep = &bwt->interval_bw[j].endpoints; +while (!list_empty (ep)) +list_del_init (ep->next); + } + } +for (i =1 ; i <MAX_HC_SLOTS ; ++i)xhci_free_virt_device (xhci, i);
@@ -1757,16 +1767,6 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci)if (!xhci->rh_bw) goto no_bw; - num_ports =HCS_MAX_PORTS (xhci->hcs_params1); -for (i =0 ; i < num_ports; i++) { -struct xhci_interval_bw_table *bwt = &xhci->rh_bw[i].bw_table; -for (j =0 ; j <XHCI_MAX_INTERVAL ; j++) { -struct list_head *ep = &bwt->interval_bw[j].endpoints; -while (!list_empty (ep)) -list_del_init (ep->next); - } - } -for (i =0 ; i < num_ports; i++) {struct xhci_tt_bw_info *tt, *n;list_for_each_entry_safe (tt, n, &xhci->rh_bw[i].tts, tt_list) {
drivers/usb/serial/ftdi_sio.c +2 -0
@@ -580,6 +580,8 @@ static const struct usb_device_id id_table_combined[] = { { USB_DEVICE(FTDI_VID, FTDI_TAVIR_STK500_PID) }, { USB_DEVICE(FTDI_VID, FTDI_TIAO_UMPA_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },/* * ELV devices: */
drivers/usb/serial/ftdi_sio_ids.h +5 -0
@@ -538,6 +538,11 @@*/ #define FTDI_TIAO_UMPA_PID 0x8a98/* TIAO/DIYGADGET USB Multi-Protocol Adapter */ +/* +* NovaTech product ids (FTDI_VID) +*/ +#define FTDI_NT_ORIONLXM_PID 0x7c90/* OrionLXm Substation Automation Platform */ +/********************************/ /** third-party VID/PID combos **/
drivers/usb/serial/io_ti.c +1 -1
@@ -821,7 +821,7 @@ static int build_i2c_fw_hdr(__u8 *header, struct device *dev) firmware_rec = (struct ti_i2c_firmware_rec *)i2c_header->Data; i2c_header->Type =I2C_DESC_TYPE_FIRMWARE_BLANK ; - i2c_header->Size = (__u16 )buffer_size; + i2c_header->Size =cpu_to_le16 (buffer_size); i2c_header->CheckSum = cs; firmware_rec->Ver_Major = OperationalMajorVersion; firmware_rec->Ver_Minor = OperationalMinorVersion;
drivers/usb/serial/io_usbvend.h +1 -1
@@ -594,7 +594,7 @@ struct edge_boot_descriptor {struct ti_i2c_desc {__u8 Type;// Type of descriptor -__u16 Size;// Size of data only not including header +__le16 Size;// Size of data only not including header __u8 CheckSum;// Checksum (8 bit sum of data only) __u8 Data[0 ];// Data starts here } __attribute__((packed));
drivers/usb/serial/option.c +2 -0
@@ -161,6 +161,7 @@ static void option_instat_callback(struct urb *urb);#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED 0x9000#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED 0x9001#define NOVATELWIRELESS_PRODUCT_E362 0x9010 +#define NOVATELWIRELESS_PRODUCT_E371 0x9011#define NOVATELWIRELESS_PRODUCT_G2 0xA010#define NOVATELWIRELESS_PRODUCT_MC551 0xB001
@@ -1012,6 +1013,7 @@ static const struct usb_device_id option_ids[] = {/* Novatel Ovation MC551 a.k.a. Verizon USB551L */ { USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC551, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E362, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E371, 0xff, 0xff, 0xff) }, { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01) }, { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01A) },
fs/proc/task_mmu.c +1 -1
@@ -1350,7 +1350,7 @@ static int gather_hugetbl_stats(pte_t *pte, unsigned long hmask,struct numa_maps *md;struct page *page; -if (pte_none (*pte)) +if (!pte_present (*pte))return 0 ; page =pte_page (*pte);
include/linux/percpu-refcount.h +3 -3
@@ -110,7 +110,7 @@ static inline void percpu_ref_get(struct percpu_ref *ref) pcpu_count =ACCESS_ONCE (ref->pcpu_count);if (likely (REF_STATUS (pcpu_count) ==PCPU_REF_PTR )) -__this_cpu_inc (*pcpu_count); +this_cpu_inc (*pcpu_count);else atomic_inc (&ref->count);
@@ -139,7 +139,7 @@ static inline bool percpu_ref_tryget(struct percpu_ref *ref) pcpu_count =ACCESS_ONCE (ref->pcpu_count);if (likely (REF_STATUS (pcpu_count) ==PCPU_REF_PTR )) { -__this_cpu_inc (*pcpu_count); +this_cpu_inc (*pcpu_count); ret = true; }
@@ -164,7 +164,7 @@ static inline void percpu_ref_put(struct percpu_ref *ref) pcpu_count =ACCESS_ONCE (ref->pcpu_count);if (likely (REF_STATUS (pcpu_count) ==PCPU_REF_PTR )) -__this_cpu_dec (*pcpu_count); +this_cpu_dec (*pcpu_count);else if (unlikely (atomic_dec_and_test (&ref->count))) ref->release (ref);
include/uapi/linux/usb/Kbuild +1 -0
@@ -1,6 +1,7 @@ # UAPI Header export list header-y += audio.h header-y += cdc.h +header-y += cdc-wdm.h header-y += ch11.h header-y += ch9.h header-y += functionfs.h
include/uapi/linux/usb/cdc-wdm.h +2 -0
@@ -9,6 +9,8 @@#ifndef _UAPI__LINUX_USB_CDC_WDM_H#define _UAPI__LINUX_USB_CDC_WDM_H +#include <linux/types.h> +/* * This IOCTL is used to retrieve the wMaxCommand for the device, * defining the message limit for both reading and writing.
kernel/cpu.c +4 -2
@@ -692,10 +692,12 @@ void set_cpu_present(unsigned int cpu, bool present)void set_cpu_online (unsigned int cpu,bool online) { -if (online) +if (online) {cpumask_set_cpu (cpu,to_cpumask (cpu_online_bits)); -else +cpumask_set_cpu (cpu,to_cpumask (cpu_active_bits)); + }else {cpumask_clear_cpu (cpu,to_cpumask (cpu_online_bits)); + } }void set_cpu_active (unsigned int cpu,bool active)
kernel/events/core.c +41 -22
177 lines not on this page · raw message
kernel/sched/core.c +39 -16
89 lines not on this page · raw message
kernel/sched/cpudeadline.c +1 -3
@@ -210,7 +210,5 @@ int cpudl_init(struct cpudl *cp)*/ void cpudl_cleanup (struct cpudl *cp) { -/* -* nothing to do for the moment -*/ +free_cpumask_var (cp->free_cpus); }
kernel/sched/cpupri.c +1 -2
@@ -70,8 +70,7 @@ int cpupri_find(struct cpupri *cp, struct task_struct *p,int idx =0 ;int task_pri =convert_prio (p->prio); -if (task_pri >=MAX_RT_PRIO ) -return 0 ; +BUG_ON (task_pri >=CPUPRI_NR_PRIORITIES );for (idx =0 ; idx < task_pri; idx++) {struct cpupri_vec *vec = &cp->pri_to_cpu[idx];
kernel/sched/cputime.c +16 -16
@@ -326,50 +326,50 @@ out:* softirq as those do not count in task exec_runtime any more. */ static void irqtime_account_process_tick (struct task_struct *p,int user_tick, -struct rq *rq) +struct rq *rq,int ticks) { -cputime_t one_jiffy_scaled =cputime_to_scaled (cputime_one_jiffy); +cputime_t scaled =cputime_to_scaled (cputime_one_jiffy); +u64 cputime = (__force u64 ) cputime_one_jiffy;u64 *cpustat = kcpustat_this_cpu->cpustat;if (steal_account_process_tick ())return ; + cputime *= ticks; + scaled *= ticks; +if (irqtime_account_hi_update ()) { - cpustat[CPUTIME_IRQ ] += (__force u64 ) cputime_one_jiffy; + cpustat[CPUTIME_IRQ ] += cputime; }else if (irqtime_account_si_update ()) { - cpustat[CPUTIME_SOFTIRQ ] += (__force u64 ) cputime_one_jiffy; + cpustat[CPUTIME_SOFTIRQ ] += cputime; }else if (this_cpu_ksoftirqd () == p) {/* * ksoftirqd time do not get accounted in cpu_softirq_time. * So, we have to handle it separately here. * Also, p->stime needs to be updated for ksoftirqd. */ -__account_system_time (p, cputime_one_jiffy, one_jiffy_scaled, -CPUTIME_SOFTIRQ ); +__account_system_time (p, cputime, scaled,CPUTIME_SOFTIRQ ); }else if (user_tick) { -account_user_time (p, cputime_one_jiffy, one_jiffy_scaled); +account_user_time (p, cputime, scaled); }else if (p == rq->idle) { -account_idle_time (cputime_one_jiffy); +account_idle_time (cputime); }else if (p->flags &PF_VCPU ) {/* System time or guest time */ -account_guest_time (p, cputime_one_jiffy, one_jiffy_scaled); +account_guest_time (p, cputime, scaled); }else { -__account_system_time (p, cputime_one_jiffy, one_jiffy_scaled, -CPUTIME_SYSTEM ); +__account_system_time (p, cputime, scaled,CPUTIME_SYSTEM ); } }static void irqtime_account_idle_ticks (int ticks) { -int i;struct rq *rq =this_rq (); -for (i =0 ; i < ticks; i++) -irqtime_account_process_tick (current,0 , rq); +irqtime_account_process_tick (current,0 , rq, ticks); }#else /* CONFIG_IRQ_TIME_ACCOUNTING */ static inline void irqtime_account_idle_ticks (int ticks) {}static inline void irqtime_account_process_tick (struct task_struct *p,int user_tick, -struct rq *rq) {} +struct rq *rq,int nr_ticks) {}#endif /* CONFIG_IRQ_TIME_ACCOUNTING */ /*
@@ -458,7 +458,7 @@ void account_process_tick(struct task_struct *p, int user_tick)return ;if (sched_clock_irqtime) { -irqtime_account_process_tick (p, user_tick, rq); +irqtime_account_process_tick (p, user_tick, rq,1 );return ; }
kernel/sched/deadline.c +9 -1
@@ -490,9 +490,17 @@ static enum hrtimer_restart dl_task_timer(struct hrtimer *timer) struct sched_dl_entity, dl_timer);struct task_struct *p =dl_task_of (dl_se); -struct rq *rq =task_rq (p); +struct rq *rq; +again: + rq =task_rq (p);raw_spin_lock (&rq->lock); +if (rq !=task_rq (p)) { +/* Task was moved, retrying. */ +raw_spin_unlock (&rq->lock); + goto again; + } +/* * We need to take care of a possible races here. In fact, the * task might have changed its scheduling policy to something
mm/memory-failure.c +2 -0
@@ -1157,6 +1157,8 @@ int memory_failure(unsigned long pfn, int trapno, int flags)*/ if (!PageHWPoison (p)) {printk (KERN_ERR "MCE %#lx: just unpoisoned\n" , pfn); +atomic_long_sub (nr_pages, &num_poisoned_pages); +put_page (hpage); res =0 ; goto out; }
mm/mempolicy.c +5 -1
@@ -526,9 +526,13 @@ static void queue_pages_hugetlb_pmd_range(struct vm_area_struct *vma,int nid;struct page *page;spinlock_t *ptl; +pte_t entry; ptl =huge_pte_lock (hstate_vma (vma), vma->vm_mm, (pte_t *)pmd); - page =pte_page (huge_ptep_get ((pte_t *)pmd)); + entry =huge_ptep_get ((pte_t *)pmd); +if (!pte_present (entry)) + goto unlock; + page =pte_page (entry); nid =page_to_nid (page);if (node_isset (nid, *nodes) == !!(flags &MPOL_MF_INVERT )) goto unlock;
mm/rmap.c +1 -2
@@ -1554,10 +1554,9 @@ void __put_anon_vma(struct anon_vma *anon_vma) {struct anon_vma *root = anon_vma->root; +anon_vma_free (anon_vma);if (root != anon_vma &&atomic_dec_and_test (&root->refcount))anon_vma_free (root); - -anon_vma_free (anon_vma); } static struct anon_vma *rmap_walk_anon_lock(struct page *page,
mm/vmscan.c +0 -18
@@ -1916,24 +1916,6 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc, }/* -* Prevent the reclaimer from falling into the cache trap: as -* cache pages start out inactive, every cache fault will tip -* the scan balance towards the file LRU. And as the file LRU -* shrinks, so does the window for rotation from references. -* This means we have a runaway feedback loop where a tiny -* thrashing file LRU becomes infinitely more attractive than -* anon pages. Try to detect this based on file LRU size. -*/ -if (global_reclaim (sc)) { -unsigned long free =zone_page_state (zone,NR_FREE_PAGES ); - -if (unlikely (file + free <=high_wmark_pages (zone))) { - scan_balance =SCAN_ANON ; - goto out; - } - } - -/* * There is enough inactive page cache, do not reclaim * anything from the anonymous working set right now. */
net/bluetooth/l2cap_core.c +2 -2
@@ -7471,9 +7471,9 @@ int __init l2cap_init(void) l2cap_debugfs =debugfs_create_file ("l2cap" ,0444 , bt_debugfs,NULL , &l2cap_debugfs_fops); -debugfs_create_u16 ("l2cap_le_max_credits" ,0466 , bt_debugfs, +debugfs_create_u16 ("l2cap_le_max_credits" ,0644 , bt_debugfs, &le_max_credits); -debugfs_create_u16 ("l2cap_le_default_mps" ,0466 , bt_debugfs, +debugfs_create_u16 ("l2cap_le_default_mps" ,0644 , bt_debugfs, &le_default_mps);bt_6lowpan_init ();
net/ipv6/netfilter.c +4 -2
@@ -30,13 +30,15 @@ int ip6_route_me_harder(struct sk_buff *skb) .daddr = iph->daddr, .saddr = iph->saddr, }; +int err; dst =ip6_route_output (net, skb->sk, &fl6); -if (dst->error) { + err = dst->error; +if (err) {IP6_INC_STATS (net,ip6_dst_idev (dst),IPSTATS_MIB_OUTNOROUTES );LIMIT_NETDEBUG (KERN_DEBUG "ip6_route_me_harder: No more route.\n" );dst_release (dst); -return dst->error; +return err; }/* Drop old route. */
net/netfilter/nfnetlink.c +4 -4
@@ -248,15 +248,15 @@ replay:#endif {nfnl_unlock (subsys_id); -kfree_skb (nskb); -return netlink_ack (skb, nlh, -EOPNOTSUPP ); +netlink_ack (skb, nlh, -EOPNOTSUPP ); +return kfree_skb (nskb); } }if (!ss->commit || !ss->abort) {nfnl_unlock (subsys_id); -kfree_skb (nskb); -return netlink_ack (skb, nlh, -EOPNOTSUPP ); +netlink_ack (skb, nlh, -EOPNOTSUPP ); +return kfree_skb (skb); }while (skb->len >=nlmsg_total_size (0 )) {
sound/pci/hda/patch_analog.c +1 -0
@@ -333,6 +333,7 @@ static const struct hda_fixup ad1986a_fixups[] = {static const struct snd_pci_quirk ad1986a_fixup_tbl[] = {SND_PCI_QUIRK (0x103c ,0x30af ,"HP B2800" ,AD1986A_FIXUP_LAPTOP_IMIC ), +SND_PCI_QUIRK (0x1043 ,0x1447 ,"ASUS A8JN" ,AD1986A_FIXUP_EAPD ),SND_PCI_QUIRK_MASK (0x1043 ,0xff00 ,0x8100 ,"ASUS P5" ,AD1986A_FIXUP_3STACK ),SND_PCI_QUIRK_MASK (0x1043 ,0xff00 ,0x8200 ,"ASUS M2" ,AD1986A_FIXUP_3STACK ),SND_PCI_QUIRK (0x10de ,0xcb84 ,"ASUS A8N-VM" ,AD1986A_FIXUP_3STACK ),
sound/pci/hda/patch_realtek.c +4 -6
@@ -1646,12 +1646,10 @@ static const struct hda_fixup alc260_fixups[] = { [ALC260_FIXUP_COEF] = { .type = HDA_FIXUP_VERBS, .v.verbs = (const struct hda_verb []) { - {0x20 ,AC_VERB_SET_COEF_INDEX ,0x07 }, - {0x20 ,AC_VERB_SET_PROC_COEF ,0x3040 }, + {0x1a ,AC_VERB_SET_COEF_INDEX ,0x07 }, + {0x1a ,AC_VERB_SET_PROC_COEF ,0x3040 }, { } }, - .chained = true, - .chain_id = ALC260_FIXUP_HP_PIN_0F, }, [ALC260_FIXUP_GPIO1] = { .type = HDA_FIXUP_VERBS,
@@ -1666,8 +1664,8 @@ static const struct hda_fixup alc260_fixups[] = { [ALC260_FIXUP_REPLACER] = { .type = HDA_FIXUP_VERBS, .v.verbs = (const struct hda_verb []) { - {0x20 ,AC_VERB_SET_COEF_INDEX ,0x07 }, - {0x20 ,AC_VERB_SET_PROC_COEF ,0x3050 }, + {0x1a ,AC_VERB_SET_COEF_INDEX ,0x07 }, + {0x1a ,AC_VERB_SET_PROC_COEF ,0x3050 }, { } }, .chained = true,