Linux 3.12.5
Greg KH
maintainerI'm announcing the release of the 3.12.5 kernel.
All users of the 3.12 kernel series must upgrade.
The updated 3.12.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.12.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/boot/dts/armada-370-db.dts | 28 +- arch/arm/boot/dts/armada-370-xp.dtsi | 2 arch/arm/boot/dts/armada-xp-mv78230.dtsi | 24 +- arch/arm/boot/dts/armada-xp-mv78260.dtsi | 109 ++++++++-- arch/arm/boot/dts/omap4-panda-common.dtsi | 20 - arch/arm/configs/multi_v7_defconfig | 2 arch/arm/include/asm/pgtable.h | 2 arch/arm/mach-at91/sama5d3.c | 6 arch/arm/mach-footbridge/common.c | 3 arch/arm/mach-footbridge/dc21285.c | 2 arch/arm/mach-footbridge/ebsa285.c | 22 +- arch/arm/mm/mmap.c | 2 arch/arm/mm/pgd.c | 3 arch/parisc/kernel/sys_parisc.c | 25 +- arch/s390/crypto/aes_s390.c | 31 +-- arch/x86/Makefile | 8 block/blk-cgroup.h | 8 crypto/algif_hash.c | 3 crypto/algif_skcipher.c | 3 crypto/authenc.c | 7 crypto/ccm.c | 3 drivers/ata/libata-scsi.c | 1 drivers/char/i8k.c | 7 drivers/cpuidle/cpuidle.c | 2 drivers/firewire/sbp2.c | 1 drivers/firmware/efi/efi-pstore.c | 163 ++++++++++++++-- drivers/firmware/efi/efivars.c | 12 - drivers/firmware/efi/vars.c | 12 - drivers/gpio/gpio-mpc8xxx.c | 8 drivers/input/Kconfig | 2 drivers/input/keyboard/Kconfig | 4 drivers/input/serio/Kconfig | 6 drivers/misc/enclosure.c | 7 drivers/misc/mei/hw-me-regs.h | 6 drivers/misc/mei/pci-me.c | 5 drivers/net/can/c_can/c_can.c | 21 +- drivers/net/can/flexcan.c | 2 drivers/net/can/sja1000/sja1000.c | 17 - drivers/net/ethernet/broadcom/tg3.c | 12 - drivers/net/wireless/iwlwifi/dvm/tx.c | 14 - drivers/pnp/driver.c | 12 + drivers/scsi/3w-9xxx.c | 3 drivers/scsi/3w-sas.c | 3 drivers/scsi/3w-xxxx.c | 3 drivers/scsi/aacraid/linit.c | 1 drivers/scsi/arcmsr/arcmsr_hba.c | 1 drivers/scsi/bfa/bfa_fcs.h | 1 drivers/scsi/bfa/bfa_fcs_lport.c | 14 + drivers/scsi/bfa/bfad_attr.c | 7 drivers/scsi/gdth.c | 1 drivers/scsi/hosts.c | 1 drivers/scsi/hpsa.c | 5 drivers/scsi/ipr.c | 3 drivers/scsi/ips.c | 1 drivers/scsi/libsas/sas_ata.c | 2 drivers/scsi/megaraid.c | 1 drivers/scsi/megaraid/megaraid_mbox.c | 1 drivers/scsi/megaraid/megaraid_sas_base.c | 1 drivers/scsi/pmcraid.c | 1 drivers/scsi/sd.c | 6 drivers/scsi/storvsc_drv.c | 1 drivers/spi/spi-pxa2xx.c | 2 drivers/tty/n_tty.c | 6 drivers/usb/class/cdc-acm.c | 2 drivers/usb/serial/ftdi_sio.c | 37 ++- drivers/usb/serial/mos7840.c | 32 +-- drivers/usb/serial/pl2303.c | 30 +- drivers/usb/serial/spcp8x5.c | 30 +- drivers/video/omap2/displays-new/panel-sony-acx565akm.c | 5 drivers/xen/grant-table.c | 6 fs/nfs/nfs4proc.c | 10 fs/pipe.c | 39 +-- include/crypto/scatterwalk.h | 3 include/linux/efi.h | 4 include/scsi/scsi_host.h | 6 include/sound/soc-dapm.h | 3 kernel/irq/pm.c | 2 kernel/time/timekeeping.c | 2 net/ipv4/udp.c | 3 sound/pci/hda/patch_analog.c | 4 sound/pci/hda/patch_realtek.c | 55 ++++- sound/soc/codecs/wm8731.c | 4 sound/soc/codecs/wm8990.c | 2 84 files changed, 676 insertions(+), 297 deletions(-)
Aaro Koskinen (1):
ARM: OMAPFB: panel-sony-acx565akm: fix bad unlock balance
Alan Cox (1):
drivers/char/i8k.c: add Dell XPLS L421X
Arnaud Ebalard (2):
ARM: mvebu: second PCIe unit of Armada XP mv78230 is only x1 capable
ARM: mvebu: fix second and third PCIe unit of Armada XP mv78260
Balaji T K (1):
ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx
Bo Shen (1):
ASoC: wm8731: fix dsp mode configuration
Colin Leitner (4):
USB: pl2303: fixed handling of CS5 setting
USB: ftdi_sio: fixed handling of unsupported CSIZE setting
USB: mos7840: correct handling of CS5 setting
USB: spcp8x5: correct handling of CS5 setting
Dan Williams (1):
SCSI: libsas: fix usage of ata_tf_to_fis
David Cluytens (1):
USB: cdc-acm: Added support for the Lenovo RD02-D400 USB Modem
David Henningsson (2):
ALSA: hda - Fix headset mic input after muted internal mic (Dell/Realtek)
ALSA: hda - Add mono speaker quirk for Dell Inspiron 5439
Dmitry Torokhov (1):
PNP: fix restoring devices after hibernation
Emmanuel Grumbach (1):
iwlwifi: dvm: don't override mac80211's queue setting
Gerald Schaefer (1):
crypto: s390 - Fix aes-xts parameter corruption
Greg Kroah-Hartman (1):
Linux 3.12.5
Gregory CLEMENT (1):
ARM: mvebu: use the virtual CPU registers to access coherency registers
H. Peter Anvin (1):
x86-64, build: Always pass in -mno-sse
Helge Deller (1):
parisc: fix mmap(MAP_FIXED|MAP_SHARED) to already mmapped address
Hong Zhiguo (1):
Update of blkg_stat and blkg_rwstat may happen in bh context. While u64_stats_fetch_retry is only preempt_disable on 32bit UP system. This is not enough to avoid preemption by bh and may read strange 64 bit value.
Horia Geanta (1):
crypto: ccm - Fix handling of zero plaintext when computing mac
Ivan Vecera (1):
tg3: avoid double-freeing of rx data memory
James Bottomley (1):
SCSI: enclosure: fix WARN_ON in dual path device removing
Konrad Rzeszutek Wilk (1):
cpuidle: Check for dev before deregistering it.
Laxman Dewangan (1):
irq: Enable all irqs unconditionally in irq_resume
Linus Torvalds (1):
vfs: fix subtle use-after-free of pipe_inode_info
Liu Gang (1):
powerpc/gpio: Fix the wrong GPIO input data on MPC8572/MPC8536
Ludovic Desroches (1):
ARM: at91: sama5d3: reduce TWI internal clock frequency
Madper Xie (1):
efi-pstore: Make efi-pstore return a unique id
Marc Kleine-Budde (2):
can: flexcan: use correct clock as base for bit rate calculation
can: c_can: don't call pm_runtime_get_sync() from interrupt context
Mark Brown (1):
ASoC: wm8990: Mark the register map as dirty when powering down
Martin K. Petersen (1):
SCSI: Disable WRITE SAME for RAID and virtual host adapter drivers
Martin Schwidefsky (1):
time: Fix 1ns/tick drift w/ GENERIC_TIME_VSYSCALL_OLD
Matt Wilson (1):
xen/gnttab: leave lazy MMU mode in the case of a m2p override failure
Mika Westerberg (1):
spi/pxa2xx: add new ACPI IDs
Oliver Hartkopp (1):
can: sja1000: fix {pre,post}_irq() handling and IRQ handler return value
Olof Johansson (1):
ARM: multi_v7_defconfig: enable SDHCI_BCM_KONA and MMC_BLOCK_MINORS=16
Peter Hurley (1):
n_tty: Fix missing newline echo
Russell King (3):
ARM: fix booting low-vectors machines
ARM: footbridge: fix VGA initialisation
ARM: footbridge: fix EBSA285 LEDs
Seiji Aguchi (1):
efivars, efi-pstore: Hold off deletion of sysfs entry until the scan is completed
Shawn Landden (1):
net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST
Stephen M. Cameron (2):
SCSI: hpsa: do not discard scsi status on aborted commands
SCSI: hpsa: return 0 from driver probe function on success, not 1
Stephen Warren (1):
ASoC: dapm: Use SND_SOC_DAPM_INIT_REG_VAL in SND_SOC_DAPM_MUX
Takashi Iwai (5):
ALSA: hda - Fix silent output on ASUS W7J laptop
ALSA: hda - Another fixup for ASUS laptop with ALC660 codec
ALSA: hda - Use always amps for auto-mute on AD1986A codec
ALSA: hda - Fix bad EAPD setup for HP machines with AD1984A
ALSA: hda - Fix silent output on MacBook Air 2,1
Thomas Petazzoni (1):
ARM: mvebu: re-enable PCIe on Armada 370 DB
Tom Gundersen (2):
Input: allow deselecting serio drivers even without CONFIG_EXPERT
Input: mousedev - allow disabling even without CONFIG_EXPERT
Tom Lendacky (3):
crypto: scatterwalk - Set the chain pointer indication bit
crypto: authenc - Find proper IV address in ablkcipher callback
crypto: scatterwalk - Use sg_chain_ptr on chain entries
Tomas Winkler (2):
mei: me: add Lynx Point Wellsburg work station device id
mei: add 9 series PCH mei device ids
Trond Myklebust (1):
NFSv4: Update list of irrecoverable errors on DELEGRETURN
Vijaya Mohan Guvva (1):
SCSI: bfa: Fix crash when symb name set for offline vport
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 12 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = NAME = One Giant Leap for Frogkind
arch/arm/boot/dts/armada-370-db.dts +14 -14
@@ -99,22 +99,22 @@ spi-max-frequency = <50000000>; }; }; + }; - pcie-controller { + pcie-controller { + status = "okay"; + /* + * The two PCIe units are accessible through + * both standard PCIe slots and mini-PCIe + * slots on the board. + */ + pcie@1,0 { + /* Port 0, Lane 0 */ + status = "okay"; + }; + pcie@2,0 { + /* Port 1, Lane 0 */ status = "okay"; - /* - * The two PCIe units are accessible through - * both standard PCIe slots and mini-PCIe - * slots on the board. - */ - pcie@1,0 { - /* Port 0, Lane 0 */ - status = "okay"; - }; - pcie@2,0 { - /* Port 1, Lane 0 */ - status = "okay"; - }; }; }; };
arch/arm/boot/dts/armada-370-xp.dtsi +1 -1
@@ -117,7 +117,7 @@ coherency-fabric@20200 { compatible = "marvell,coherency-fabric"; - reg = <0x20200 0xb0>, <0x21810 0x1c>; + reg = <0x20200 0xb0>, <0x21010 0x1c>; }; serial@12000 {
arch/arm/boot/dts/armada-xp-mv78230.dtsi +12 -12
@@ -47,7 +47,7 @@ /* * MV78230 has 2 PCIe units Gen2.0: One unit can be * configured as x4 or quad x1 lanes. One unit is - * x4/x1. + * x1 only. */ pcie-controller { compatible = "marvell,armada-xp-pcie";
@@ -61,10 +61,10 @@ ranges = <0x82000000 0 0x40000 MBUS_ID(0xf0, 0x01) 0x40000 0 0x00002000 /* Port 0.0 registers */ - 0x82000000 0 0x42000 MBUS_ID(0xf0, 0x01) 0x42000 0 0x00002000 /* Port 2.0 registers */ 0x82000000 0 0x44000 MBUS_ID(0xf0, 0x01) 0x44000 0 0x00002000 /* Port 0.1 registers */ 0x82000000 0 0x48000 MBUS_ID(0xf0, 0x01) 0x48000 0 0x00002000 /* Port 0.2 registers */ 0x82000000 0 0x4c000 MBUS_ID(0xf0, 0x01) 0x4c000 0 0x00002000 /* Port 0.3 registers */ + 0x82000000 0 0x80000 MBUS_ID(0xf0, 0x01) 0x80000 0 0x00002000 /* Port 1.0 registers */ 0x82000000 0x1 0 MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */ 0x81000000 0x1 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO */ 0x82000000 0x2 0 MBUS_ID(0x04, 0xd8) 0 1 0 /* Port 0.1 MEM */
@@ -73,8 +73,8 @@ 0x81000000 0x3 0 MBUS_ID(0x04, 0xb0) 0 1 0 /* Port 0.2 IO */ 0x82000000 0x4 0 MBUS_ID(0x04, 0x78) 0 1 0 /* Port 0.3 MEM */ 0x81000000 0x4 0 MBUS_ID(0x04, 0x70) 0 1 0 /* Port 0.3 IO */ - 0x82000000 0x9 0 MBUS_ID(0x04, 0xf8) 0 1 0 /* Port 2.0 MEM */ - 0x81000000 0x9 0 MBUS_ID(0x04, 0xf0) 0 1 0 /* Port 2.0 IO */>; + 0x82000000 0x5 0 MBUS_ID(0x08, 0xe8) 0 1 0 /* Port 1.0 MEM */ + 0x81000000 0x5 0 MBUS_ID(0x08, 0xe0) 0 1 0 /* Port 1.0 IO */>; pcie@1,0 { device_type = "pci";
@@ -144,20 +144,20 @@ status = "disabled"; }; - pcie@9,0 { + pcie@5,0 { device_type = "pci"; - assigned-addresses = <0x82000800 0 0x42000 0 0x2000>; - reg = <0x4800 0 0 0 0>; + assigned-addresses = <0x82000800 0 0x80000 0 0x2000>; + reg = <0x2800 0 0 0 0>; #address-cells = <3>; #size-cells = <2>; #interrupt-cells = <1>; - ranges = <0x82000000 0 0 0x82000000 0x9 0 1 0 - 0x81000000 0 0 0x81000000 0x9 0 1 0>; + ranges = <0x82000000 0 0 0x82000000 0x5 0 1 0 + 0x81000000 0 0 0x81000000 0x5 0 1 0>; interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &mpic 99>; - marvell,pcie-port = <2>; + interrupt-map = <0 0 0 0 &mpic 62>; + marvell,pcie-port = <1>; marvell,pcie-lane = <0>; - clocks = <&gateclk 26>; + clocks = <&gateclk 9>; status = "disabled"; }; };
arch/arm/boot/dts/armada-xp-mv78260.dtsi +85 -24
154 lines not on this page · raw message
arch/arm/boot/dts/omap4-panda-common.dtsi +10 -10
@@ -239,15 +239,6 @@ 0xf0 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_sda */ >; }; -}; - -&omap4_pmx_wkup { - led_wkgpio_pins: pinmux_leds_wkpins { - pinctrl-single,pins = < - 0x1a (PIN_OUTPUT | MUX_MODE3) /* gpio_wk7 */ - 0x1c (PIN_OUTPUT | MUX_MODE3) /* gpio_wk8 */ - >; - }; /* * wl12xx GPIO outputs for WLAN_EN, BT_EN, FM_EN, BT_WAKEUP
@@ -267,7 +258,7 @@ pinctrl-single,pins = < 0x38 (PIN_INPUT | MUX_MODE3) /* gpmc_ncs2.gpio_52 */ 0x3a (PIN_INPUT | MUX_MODE3) /* gpmc_ncs3.gpio_53 */ - 0x108 (PIN_OUTPUT | MUX_MODE0) /* sdmmc5_clk.sdmmc5_clk */ + 0x108 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc5_clk.sdmmc5_clk */ 0x10a (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc5_cmd.sdmmc5_cmd */ 0x10c (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc5_dat0.sdmmc5_dat0 */ 0x10e (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc5_dat1.sdmmc5_dat1 */
@@ -277,6 +268,15 @@ }; }; +&omap4_pmx_wkup { + led_wkgpio_pins: pinmux_leds_wkpins { + pinctrl-single,pins = < + 0x1a (PIN_OUTPUT | MUX_MODE3) /* gpio_wk7 */ + 0x1c (PIN_OUTPUT | MUX_MODE3) /* gpio_wk8 */ + >; + }; +}; + &i2c1 { pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>;
arch/arm/configs/multi_v7_defconfig +2 -0
@@ -132,12 +132,14 @@ CONFIG_USB_GPIO_VBUS=y CONFIG_USB_ISP1301=y CONFIG_USB_MXS_PHY=y CONFIG_MMC=y +CONFIG_MMC_BLOCK_MINORS=16 CONFIG_MMC_ARMMMCI=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_ESDHC_IMX=y CONFIG_MMC_SDHCI_TEGRA=y CONFIG_MMC_SDHCI_SPEAR=y +CONFIG_MMC_SDHCI_BCM_KONA=y CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y CONFIG_EDAC=y
arch/arm/include/asm/pgtable.h +1 -1
@@ -61,7 +61,7 @@ extern void __pgd_error(const char *file, int line, pgd_t);* mapping to be mapped at. This is particularly important for * non-high vector CPUs. */ -#define FIRST_USER_ADDRESS PAGE_SIZE +#define FIRST_USER_ADDRESS (PAGE_SIZE * 2)/* * Use TASK_SIZE as the ceiling argument for free_pgtables() and
arch/arm/mach-at91/sama5d3.c +3 -3
@@ -95,19 +95,19 @@ static struct clk twi0_clk = { .name = "twi0_clk", .pid = SAMA5D3_ID_TWI0, .type = CLK_TYPE_PERIPHERAL, - .div = AT91_PMC_PCR_DIV2, + .div = AT91_PMC_PCR_DIV8, };static struct clk twi1_clk = { .name ="twi1_clk" , .pid =SAMA5D3_ID_TWI1 , .type =CLK_TYPE_PERIPHERAL , - .div =AT91_PMC_PCR_DIV2 , + .div =AT91_PMC_PCR_DIV8 , };static struct clk twi2_clk = { .name ="twi2_clk" , .pid =SAMA5D3_ID_TWI2 , .type =CLK_TYPE_PERIPHERAL , - .div =AT91_PMC_PCR_DIV2 , + .div =AT91_PMC_PCR_DIV8 , };static struct clk mmc0_clk = { .name ="mci0_clk" ,
arch/arm/mach-footbridge/common.c +3 -0
@@ -15,6 +15,7 @@#include <linux/init.h> #include <linux/io.h> #include <linux/spinlock.h> +#include <video/vga.h> #include <asm/pgtable.h> #include <asm/page.h>
@@ -196,6 +197,8 @@ void __init footbridge_map_io(void)iotable_init (ebsa285_host_io_desc,ARRAY_SIZE (ebsa285_host_io_desc));pci_map_io_early (__phys_to_pfn (DC21285_PCI_IO )); } + + vga_base =PCIMEM_BASE ; }void footbridge_restart (enum reboot_mode mode,const char *cmd)
arch/arm/mach-footbridge/dc21285.c +0 -2
@@ -18,7 +18,6 @@#include <linux/irq.h> #include <linux/io.h> #include <linux/spinlock.h> -#include <video/vga.h> #include <asm/irq.h> #include <asm/mach/pci.h>
@@ -291,7 +290,6 @@ void __init dc21285_preinit(void)int cfn_mode; pcibios_min_mem =0x81000000 ; - vga_base =PCIMEM_BASE ; mem_size = (unsigned int )high_memory -PAGE_OFFSET ;for (mem_mask =0x00100000 ; mem_mask <0x10000000 ; mem_mask <<=1 )
arch/arm/mach-footbridge/ebsa285.c +13 -9
@@ -30,21 +30,24 @@ static const struct {const char *name;const char *trigger; } ebsa285_leds[] = { - { "ebsa285:amber", "heartbeat", }, - { "ebsa285:green", "cpu0", }, + { "ebsa285:amber", "cpu0", }, + { "ebsa285:green", "heartbeat", }, { "ebsa285:red",}, }; +static unsigned char hw_led_state; + static void ebsa285_led_set(struct led_classdev *cdev, enum led_brightness b) { struct ebsa285_led *led = container_of(cdev, struct ebsa285_led, cdev); - if (b != LED_OFF) - *XBUS_LEDS |= led->mask; + if (b == LED_OFF) + hw_led_state |= led->mask; else - *XBUS_LEDS &= ~led->mask; + hw_led_state &= ~led->mask; + *XBUS_LEDS = hw_led_state; } static enum led_brightness ebsa285_led_get(struct led_classdev *cdev)
@@ -52,18 +55,19 @@ static enum led_brightness ebsa285_led_get(struct led_classdev *cdev)struct ebsa285_led *led =container_of (cdev, struct ebsa285_led, cdev); -return (*XBUS_LEDS & led->mask) ?LED_FULL :LED_OFF ; +return hw_led_state & led->mask ?LED_OFF :LED_FULL ; }static int __init ebsa285_leds_init (void ) {int i; -if (machine_is_ebsa285 ()) +if (!machine_is_ebsa285 ())return -ENODEV ; -/* 3 LEDS All ON */ - *XBUS_LEDS |=XBUS_LED_AMBER |XBUS_LED_GREEN |XBUS_LED_RED ; +/* 3 LEDS all off */ + hw_led_state =XBUS_LED_AMBER |XBUS_LED_GREEN |XBUS_LED_RED ; + *XBUS_LEDS = hw_led_state;for (i =0 ; i <ARRAY_SIZE (ebsa285_leds); i++) {struct ebsa285_led *led;
arch/arm/mm/mmap.c +1 -1
@@ -146,7 +146,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, info.flags =VM_UNMAPPED_AREA_TOPDOWN ; info.length = len; - info.low_limit =PAGE_SIZE ; + info.low_limit =FIRST_USER_ADDRESS ; info.high_limit = mm->mmap_base; info.align_mask = do_align ? (PAGE_MASK & (SHMLBA -1 )) :0 ; info.align_offset = pgoff <<PAGE_SHIFT ;
arch/arm/mm/pgd.c +2 -1
@@ -87,7 +87,8 @@ pgd_t *pgd_alloc(struct mm_struct *mm) init_pud =pud_offset (init_pgd,0 ); init_pmd =pmd_offset (init_pud,0 ); init_pte =pte_offset_map (init_pmd,0 ); -set_pte_ext (new_pte, *init_pte,0 ); +set_pte_ext (new_pte +0 , init_pte[0 ],0 ); +set_pte_ext (new_pte +1 , init_pte[1 ],0 );pte_unmap (init_pte);pte_unmap (new_pte); }
arch/parisc/kernel/sys_parisc.c +15 -10
@@ -61,8 +61,15 @@ static int get_offset(struct address_space *mapping)return (unsigned long ) mapping >>8 ; } -static unsigned long get_shared_area (struct address_space *mapping, -unsigned long addr,unsigned long len,unsigned long pgoff) +static unsigned long shared_align_offset (struct file *filp,unsigned long pgoff) +{ +struct address_space *mapping = filp ? filp->f_mapping :NULL ; + +return (get_offset (mapping) + pgoff) <<PAGE_SHIFT ; +} + +static unsigned long get_shared_area (struct file *filp,unsigned long addr, +unsigned long len,unsigned long pgoff) {struct vm_unmapped_area_info info;
@@ -71,7 +78,7 @@ static unsigned long get_shared_area(struct address_space *mapping, info.low_limit =PAGE_ALIGN (addr); info.high_limit =TASK_SIZE ; info.align_mask =PAGE_MASK & (SHMLBA -1 ); - info.align_offset = (get_offset (mapping) + pgoff) <<PAGE_SHIFT ; + info.align_offset =shared_align_offset (filp, pgoff);return vm_unmapped_area (&info); }
@@ -82,20 +89,18 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,return -ENOMEM ;if (flags &MAP_FIXED ) {if ((flags &MAP_SHARED ) && - (addr - (pgoff <<PAGE_SHIFT )) & (SHMLBA -1 )) + (addr -shared_align_offset (filp, pgoff)) & (SHMLBA -1 ))return -EINVAL ;return addr; }if (!addr) addr =TASK_UNMAPPED_BASE ; -if (filp) { - addr =get_shared_area (filp->f_mapping, addr, len, pgoff); - }else if (flags &MAP_SHARED ) { - addr =get_shared_area (NULL , addr, len, pgoff); - }else { +if (filp || (flags &MAP_SHARED )) + addr =get_shared_area (filp, addr, len, pgoff); +else addr =get_unshared_area (addr, len); - } +return addr; }
arch/s390/crypto/aes_s390.c +17 -14
@@ -55,8 +55,7 @@ struct pcc_param {struct s390_xts_ctx {u8 key[32 ]; -u8 xts_param[16 ]; -struct pcc_param pcc; +u8 pcc_key[32 ];long enc;long dec;int key_len;
@@ -591,7 +590,7 @@ static int xts_aes_set_key(struct crypto_tfm *tfm, const u8 *in_key, xts_ctx->enc =KM_XTS_128_ENCRYPT ; xts_ctx->dec =KM_XTS_128_DECRYPT ;memcpy (xts_ctx->key +16 , in_key,16 ); -memcpy (xts_ctx->pcc.key +16 , in_key +16 ,16 ); +memcpy (xts_ctx->pcc_key +16 , in_key +16 ,16 );break ;case 48 : xts_ctx->enc =0 ;
@@ -602,7 +601,7 @@ static int xts_aes_set_key(struct crypto_tfm *tfm, const u8 *in_key, xts_ctx->enc =KM_XTS_256_ENCRYPT ; xts_ctx->dec =KM_XTS_256_DECRYPT ;memcpy (xts_ctx->key, in_key,32 ); -memcpy (xts_ctx->pcc.key, in_key +32 ,32 ); +memcpy (xts_ctx->pcc_key, in_key +32 ,32 );break ;default : *flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ;
@@ -621,29 +620,33 @@ static int xts_aes_crypt(struct blkcipher_desc *desc, long func,unsigned int nbytes = walk->nbytes;unsigned int n;u8 *in, *out; -void *param; +struct pcc_param pcc_param; +struct { +u8 key[32 ]; +u8 init[16 ]; + } xts_param;if (!nbytes) goto out; -memset (xts_ctx->pcc.block,0 ,sizeof (xts_ctx->pcc.block)); -memset (xts_ctx->pcc.bit,0 ,sizeof (xts_ctx->pcc.bit)); -memset (xts_ctx->pcc.xts,0 ,sizeof (xts_ctx->pcc.xts)); -memcpy (xts_ctx->pcc.tweak, walk->iv,sizeof (xts_ctx->pcc.tweak)); - param = xts_ctx->pcc.key + offset; - ret =crypt_s390_pcc (func, param); +memset (pcc_param.block,0 ,sizeof (pcc_param.block)); +memset (pcc_param.bit,0 ,sizeof (pcc_param.bit)); +memset (pcc_param.xts,0 ,sizeof (pcc_param.xts)); +memcpy (pcc_param.tweak, walk->iv,sizeof (pcc_param.tweak)); +memcpy (pcc_param.key, xts_ctx->pcc_key,32 ); + ret =crypt_s390_pcc (func, &pcc_param.key[offset]);if (ret <0 )return -EIO ; -memcpy (xts_ctx->xts_param, xts_ctx->pcc.xts,16 ); - param = xts_ctx->key + offset; +memcpy (xts_param.key, xts_ctx->key,32 ); +memcpy (xts_param.init, pcc_param.xts,16 ); do { /* only use complete blocks */ n = nbytes & ~(AES_BLOCK_SIZE - 1); out = walk->dst.virt.addr; in = walk->src.virt.addr; - ret = crypt_s390_km(func, param, out, in, n); + ret = crypt_s390_km(func, &xts_param.key[offset], out, in, n); if (ret < 0 || ret != n) return -EIO;
arch/x86/Makefile +7 -1
@@ -31,6 +31,9 @@ ifeq ($(CONFIG_X86_32),y) KBUILD_CFLAGS += -msoft-float -mregparm=3 -freg-struct-return + # Don't autogenerate SSE instructions + KBUILD_CFLAGS += -mno-sse + # Never want PIC in a 32-bit kernel, prevent breakage with GCC built # with nonstandard options KBUILD_CFLAGS += -fno-pic
@@ -57,8 +60,11 @@ else KBUILD_AFLAGS += -m64 KBUILD_CFLAGS += -m64 + # Don't autogenerate SSE instructions + KBUILD_CFLAGS += -mno-sse + # Use -mpreferred-stack-boundary=3 if supported. - KBUILD_CFLAGS += $(call cc-option,-mno-sse -mpreferred-stack-boundary=3) + KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=3) # FIXME - should be integrated in Makefile.cpu (Makefile_32.cpu) cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)
block/blk-cgroup.h +4 -4
@@ -430,9 +430,9 @@ static inline uint64_t blkg_stat_read(struct blkg_stat *stat)uint64_t v;do { - start =u64_stats_fetch_begin (&stat->syncp); + start =u64_stats_fetch_begin_bh (&stat->syncp); v = stat->cnt; - }while (u64_stats_fetch_retry (&stat->syncp, start)); + }while (u64_stats_fetch_retry_bh (&stat->syncp, start));return v; }
@@ -498,9 +498,9 @@ static inline struct blkg_rwstat blkg_rwstat_read(struct blkg_rwstat *rwstat)struct blkg_rwstat tmp;do { - start =u64_stats_fetch_begin (&rwstat->syncp); + start =u64_stats_fetch_begin_bh (&rwstat->syncp); tmp = *rwstat; - }while (u64_stats_fetch_retry (&rwstat->syncp, start)); + }while (u64_stats_fetch_retry_bh (&rwstat->syncp, start));return tmp; }
crypto/algif_hash.c +3 -0
@@ -117,6 +117,9 @@ static ssize_t hash_sendpage(struct socket *sock, struct page *page,if (flags &MSG_SENDPAGE_NOTLAST ) flags |=MSG_MORE ; +if (flags &MSG_SENDPAGE_NOTLAST ) + flags |=MSG_MORE ; +lock_sock (sk);sg_init_table (ctx->sgl.sg,1 );sg_set_page (ctx->sgl.sg, page, size, offset);
crypto/algif_skcipher.c +3 -0
@@ -381,6 +381,9 @@ static ssize_t skcipher_sendpage(struct socket *sock, struct page *page,if (flags &MSG_SENDPAGE_NOTLAST ) flags |=MSG_MORE ; +if (flags &MSG_SENDPAGE_NOTLAST ) + flags |=MSG_MORE ; +lock_sock (sk);if (!ctx->more && ctx->used) goto unlock;
crypto/authenc.c +4 -3
@@ -368,9 +368,10 @@ static void crypto_authenc_encrypt_done(struct crypto_async_request *req,if (!err) {struct crypto_aead *authenc =crypto_aead_reqtfm (areq);struct crypto_authenc_ctx *ctx =crypto_aead_ctx (authenc); -struct ablkcipher_request *abreq =aead_request_ctx (areq); -u8 *iv = (u8 *)(abreq +1 ) + -crypto_ablkcipher_reqsize (ctx->enc); +struct authenc_request_ctx *areq_ctx =aead_request_ctx (areq); +struct ablkcipher_request *abreq = (void *)(areq_ctx->tail + + ctx->reqoff); +u8 *iv = (u8 *)abreq -crypto_ablkcipher_ivsize (ctx->enc); err =crypto_authenc_genicv (areq, iv,0 ); }
crypto/ccm.c +2 -1
@@ -271,7 +271,8 @@ static int crypto_ccm_auth(struct aead_request *req, struct scatterlist *plain, }/* compute plaintext into mac */ -get_data_to_compute (cipher, pctx, plain, cryptlen); +if (cryptlen) +get_data_to_compute (cipher, pctx, plain, cryptlen); out:return err;
drivers/ata/libata-scsi.c +1 -0
@@ -3625,6 +3625,7 @@ int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht) shost->max_lun =1 ; shost->max_channel =1 ; shost->max_cmd_len =16 ; + shost->no_write_same =1 ;/* Schedule policy is determined by ->qc_defer() * callback and it needs to see every deferred qc.
drivers/char/i8k.c +7 -0
@@ -664,6 +664,13 @@ static struct dmi_system_id __initdata i8k_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Vostro"), }, }, + { + .ident = "Dell XPS421", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "XPS L421X"), + }, + }, { } };
drivers/cpuidle/cpuidle.c +1 -1
@@ -448,7 +448,7 @@ EXPORT_SYMBOL_GPL(cpuidle_register_device);*/ void cpuidle_unregister_device (struct cpuidle_device *dev) { -if (dev->registered ==0 ) +if (!dev || dev->registered ==0 )return ;cpuidle_pause_and_lock ();
drivers/firewire/sbp2.c +1 -0
@@ -1623,6 +1623,7 @@ static struct scsi_host_template scsi_driver_template = { .cmd_per_lun = 1, .can_queue = 1, .sdev_attrs = sbp2_scsi_sysfs_attrs, + .no_write_same = 1, };MODULE_AUTHOR ("Kristian Hoegsberg <[email protected]>" );
drivers/firmware/efi/efi-pstore.c +147 -16
248 lines not on this page · raw message
drivers/firmware/efi/efivars.c +8 -4
@@ -383,12 +383,16 @@ static ssize_t efivar_delete(struct file *filp, struct kobject *kobj,else if (__efivar_entry_delete (entry)) err = -EIO ; -efivar_entry_iter_end (); - -if (err) +if (err) { +efivar_entry_iter_end ();return err; + } -efivar_unregister (entry); +if (!entry->scanning) { +efivar_entry_iter_end (); +efivar_unregister (entry); + }else +efivar_entry_iter_end ();/* It's dead Jim.... */ return count;
drivers/firmware/efi/vars.c +10 -2
@@ -683,8 +683,16 @@ struct efivar_entry *efivar_entry_find(efi_char16_t *name, efi_guid_t guid,if (!found)return NULL ; -if (remove) -list_del (&entry->list); +if (remove) { +if (entry->scanning) { +/* +* The entry will be deleted +* after scanning is completed. +*/ + entry->deleting = true; + }else +list_del (&entry->list); + }return entry; }
drivers/gpio/gpio-mpc8xxx.c +6 -2
@@ -69,10 +69,14 @@ static int mpc8572_gpio_get(struct gpio_chip *gc, unsigned int gpio)u32 val;struct of_mm_gpio_chip *mm =to_of_mm_gpio_chip (gc);struct mpc8xxx_gpio_chip *mpc8xxx_gc =to_mpc8xxx_gpio_chip (mm); +u32 out_mask, out_shadow; - val =in_be32 (mm->regs +GPIO_DAT ) & ~in_be32 (mm->regs +GPIO_DIR ); + out_mask =in_be32 (mm->regs +GPIO_DIR ); -return (val | mpc8xxx_gc->data) &mpc8xxx_gpio2mask (gpio); + val =in_be32 (mm->regs +GPIO_DAT ) & ~out_mask; + out_shadow = mpc8xxx_gc->data & out_mask; + +return (val | out_shadow) &mpc8xxx_gpio2mask (gpio); }static int mpc8xxx_gpio_get (struct gpio_chip *gc,unsigned int gpio)
drivers/input/Kconfig +1 -1
@@ -80,7 +80,7 @@ config INPUT_MATRIXKMAP comment "Userland interfaces" config INPUT_MOUSEDEV - tristate "Mouse interface" if EXPERT + tristate "Mouse interface" default y help Say Y here if you want your mouse to be accessible as char devices
drivers/input/keyboard/Kconfig +2 -2
@@ -2,7 +2,7 @@ # Input core configuration # menuconfig INPUT_KEYBOARD - bool "Keyboards" if EXPERT || !X86 + bool "Keyboards" default y help Say Y here, and a list of supported keyboards will be displayed.
@@ -67,7 +67,7 @@ config KEYBOARD_ATARI module will be called atakbd. config KEYBOARD_ATKBD - tristate "AT keyboard" if EXPERT || !X86 + tristate "AT keyboard" default y select SERIO select SERIO_LIBPS2
drivers/input/serio/Kconfig +3 -3
@@ -2,7 +2,7 @@ # Input core configuration # config SERIO - tristate "Serial I/O support" if EXPERT || !X86 + tristate "Serial I/O support" default y help Say Yes here if you have any input device that uses serial I/O to
@@ -19,7 +19,7 @@ config SERIO if SERIO config SERIO_I8042 - tristate "i8042 PC Keyboard controller" if EXPERT || !X86 + tristate "i8042 PC Keyboard controller" default y depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \ (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !S390 && \
@@ -170,7 +170,7 @@ config SERIO_MACEPS2 module will be called maceps2. config SERIO_LIBPS2 - tristate "PS/2 driver library" if EXPERT + tristate "PS/2 driver library" depends on SERIO_I8042 || SERIO_I8042=n help Say Y here if you are using a driver for device connected
drivers/misc/enclosure.c +7 -0
@@ -198,6 +198,13 @@ static void enclosure_remove_links(struct enclosure_component *cdev) {char name[ENCLOSURE_NAME_SIZE ]; +/* +* In odd circumstances, like multipath devices, something else may +* already have removed the links, so check for this condition first. +*/ +if (!cdev->dev->kobj.sd) +return ; +enclosure_link_name (cdev, name);sysfs_remove_link (&cdev->dev->kobj, name);sysfs_remove_link (&cdev->cdev.kobj,"device" );
drivers/misc/mei/hw-me-regs.h +5 -1
@@ -109,8 +109,12 @@#define MEI_DEV_ID_PPT_2 0x1CBA/* Panther Point */ #define MEI_DEV_ID_PPT_3 0x1DBA/* Panther Point */ -#define MEI_DEV_ID_LPT 0x8C3A/* Lynx Point */ +#define MEI_DEV_ID_LPT_H 0x8C3A/* Lynx Point H */ +#define MEI_DEV_ID_LPT_W 0x8D3A/* Lynx Point - Wellsburg */ #define MEI_DEV_ID_LPT_LP 0x9C3A/* Lynx Point LP */ +#define MEI_DEV_ID_LPT_HR 0x8CBA/* Lynx Point H Refresh */ + +#define MEI_DEV_ID_WPT_LP 0x9CBA/* Wildcat Point LP */ /* * MEI HW Section */
drivers/misc/mei/pci-me.c +4 -1
@@ -76,8 +76,11 @@ static DEFINE_PCI_DEVICE_TABLE(mei_me_pci_tbl) = { {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_PPT_1)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_PPT_2)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_PPT_3)}, - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT_H)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT_W)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT_LP)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_LPT_HR)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_WPT_LP)},/* required last entry */ {0, }
drivers/net/can/c_can/c_can.c +15 -6
@@ -712,22 +712,31 @@ static int c_can_set_mode(struct net_device *dev, enum can_mode mode)return 0 ; } -static int c_can_get_berr_counter (const struct net_device *dev, -struct can_berr_counter *bec) +static int __c_can_get_berr_counter (const struct net_device *dev, +struct can_berr_counter *bec) {unsigned int reg_err_counter;struct c_can_priv *priv =netdev_priv (dev); -c_can_pm_runtime_get_sync (priv); - reg_err_counter = priv->read_reg (priv,C_CAN_ERR_CNT_REG ); bec->rxerr = (reg_err_counter &ERR_CNT_REC_MASK ) >>ERR_CNT_REC_SHIFT ; bec->txerr = reg_err_counter &ERR_CNT_TEC_MASK ; +return 0 ; +} + +static int c_can_get_berr_counter (const struct net_device *dev, +struct can_berr_counter *bec) +{ +struct c_can_priv *priv =netdev_priv (dev); +int err; + +c_can_pm_runtime_get_sync (priv); + err =__c_can_get_berr_counter (dev, bec);c_can_pm_runtime_put_sync (priv); -return 0 ; +return err; }/*
@@ -872,7 +881,7 @@ static int c_can_handle_state_change(struct net_device *dev,if (unlikely (!skb))return 0 ; -c_can_get_berr_counter (dev, &bec); +__c_can_get_berr_counter (dev, &bec); reg_err_counter = priv->read_reg (priv,C_CAN_ERR_CNT_REG ); rx_err_passive = (reg_err_counter &ERR_CNT_RP_MASK ) >>ERR_CNT_RP_SHIFT ;
drivers/net/can/flexcan.c +1 -1
@@ -1020,13 +1020,13 @@ static int flexcan_probe(struct platform_device *pdev)dev_err (&pdev->dev,"no ipg clock defined\n" );return PTR_ERR (clk_ipg); } - clock_freq =clk_get_rate (clk_ipg); clk_per =devm_clk_get (&pdev->dev,"per" );if (IS_ERR (clk_per)) {dev_err (&pdev->dev,"no per clock defined\n" );return PTR_ERR (clk_per); } + clock_freq =clk_get_rate (clk_per); } mem =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
drivers/net/can/sja1000/sja1000.c +9 -8
@@ -494,20 +494,20 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)uint8_t isrc, status;int n =0 ; -/* Shared interrupts and IRQ off? */ -if (priv->read_reg (priv,SJA1000_IER ) ==IRQ_OFF ) -return IRQ_NONE ; -if (priv->pre_irq) priv->pre_irq (priv); +/* Shared interrupts and IRQ off? */ +if (priv->read_reg (priv,SJA1000_IER ) ==IRQ_OFF ) + goto out; +while ((isrc = priv->read_reg (priv,SJA1000_IR )) && (n <SJA1000_MAX_IRQ )) { - n++; + status = priv->read_reg (priv,SJA1000_SR );/* check for absent controller due to hw unplug */ if (status ==0xFF &&sja1000_is_absent (priv)) -return IRQ_NONE ; + goto out;if (isrc &IRQ_WUI )netdev_warn (dev,"wakeup interrupt\n" );
@@ -535,7 +535,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id) status = priv->read_reg (priv,SJA1000_SR );/* check for absent controller */ if (status ==0xFF &&sja1000_is_absent (priv)) -return IRQ_NONE ; + goto out; } }if (isrc & (IRQ_DOI |IRQ_EI |IRQ_BEI |IRQ_EPI |IRQ_ALI )) {
@@ -543,8 +543,9 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)if (sja1000_err (dev, isrc, status))break ; } + n++; } - +out:if (priv->post_irq) priv->post_irq (priv);
drivers/net/ethernet/broadcom/tg3.c +6 -6
@@ -6848,12 +6848,6 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)pci_unmap_single (tp->pdev, dma_addr, skb_size,PCI_DMA_FROMDEVICE ); - skb =build_skb (data, frag_size); -if (!skb) { -tg3_frag_free (frag_size !=0 , data); - goto drop_it_no_recycle; - } -skb_reserve (skb,TG3_RX_OFFSET (tp));/* Ensure that the update to the data happens * after the usage of the old DMA mapping. */
@@ -6861,6 +6855,12 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget) ri->data =NULL ; + skb =build_skb (data, frag_size); +if (!skb) { +tg3_frag_free (frag_size !=0 , data); + goto drop_it_no_recycle; + } +skb_reserve (skb,TG3_RX_OFFSET (tp)); }else {tg3_recycle_rx (tnapi, tpr, opaque_key, desc_idx, *post_ptr);
drivers/net/wireless/iwlwifi/dvm/tx.c +3 -11
@@ -433,27 +433,19 @@ int iwlagn_tx_skb(struct iwl_priv *priv,/* Copy MAC header from skb into command buffer */ memcpy (tx_cmd->hdr, hdr, hdr_len); + txq_id = info->hw_queue; +if (is_agg) txq_id = priv->tid_data[sta_id][tid].agg.txq_id;else if (info->flags &IEEE80211_TX_CTL_SEND_AFTER_DTIM ) {/* -* Send this frame after DTIM -- there's a special queue -* reserved for this for contexts that support AP mode. -*/ - txq_id = ctx->mcast_queue; - -/* * The microcode will clear the more data * bit in the last frame it transmits. */ hdr->frame_control |=cpu_to_le16 (IEEE80211_FCTL_MOREDATA ); - }else if (info->flags &IEEE80211_TX_CTL_TX_OFFCHAN ) - txq_id =IWL_AUX_QUEUE ; -else - txq_id = ctx->ac_to_queue[skb_get_queue_mapping (skb)]; + } -WARN_ON_ONCE (!is_agg && txq_id != info->hw_queue);WARN_ON_ONCE (is_agg && priv->queue_to_mac80211[txq_id] != info->hw_queue);
drivers/pnp/driver.c +11 -1
@@ -197,6 +197,11 @@ static int pnp_bus_freeze(struct device *dev)return __pnp_bus_suspend (dev,PMSG_FREEZE ); } +static int pnp_bus_poweroff (struct device *dev) +{ +return __pnp_bus_suspend (dev,PMSG_HIBERNATE ); +} +static int pnp_bus_resume (struct device *dev) {struct pnp_dev *pnp_dev =to_pnp_dev (dev);
@@ -234,9 +239,14 @@ static int pnp_bus_resume(struct device *dev) }static const struct dev_pm_ops pnp_bus_dev_pm_ops = { +/* Suspend callbacks */ .suspend = pnp_bus_suspend, - .freeze = pnp_bus_freeze, .resume = pnp_bus_resume, +/* Hibernate callbacks */ + .freeze = pnp_bus_freeze, + .thaw = pnp_bus_resume, + .poweroff = pnp_bus_poweroff, + .restore = pnp_bus_resume, };struct bus_type pnp_bus_type = {
drivers/scsi/3w-9xxx.c +2 -1
@@ -2025,7 +2025,8 @@ static struct scsi_host_template driver_template = { .cmd_per_lun = TW_MAX_CMDS_PER_LUN, .use_clustering = ENABLE_CLUSTERING, .shost_attrs = twa_host_attrs, - .emulated = 1 + .emulated = 1, + .no_write_same = 1, };/* This function will probe and initialize a card */
drivers/scsi/3w-sas.c +2 -1
@@ -1600,7 +1600,8 @@ static struct scsi_host_template driver_template = { .cmd_per_lun = TW_MAX_CMDS_PER_LUN, .use_clustering = ENABLE_CLUSTERING, .shost_attrs = twl_host_attrs, - .emulated = 1 + .emulated = 1, + .no_write_same = 1, };/* This function will probe and initialize a card */
drivers/scsi/3w-xxxx.c +2 -1
@@ -2279,7 +2279,8 @@ static struct scsi_host_template driver_template = { .cmd_per_lun = TW_MAX_CMDS_PER_LUN, .use_clustering = ENABLE_CLUSTERING, .shost_attrs = tw_host_attrs, - .emulated = 1 + .emulated = 1, + .no_write_same = 1, };/* This function will probe and initialize a card */
drivers/scsi/aacraid/linit.c +1 -0
@@ -1081,6 +1081,7 @@ static struct scsi_host_template aac_driver_template = {#endif .use_clustering = ENABLE_CLUSTERING, .emulated = 1, + .no_write_same = 1, };static void __aac_shutdown (struct aac_dev * aac)
drivers/scsi/arcmsr/arcmsr_hba.c +1 -0
@@ -137,6 +137,7 @@ static struct scsi_host_template arcmsr_scsi_host_template = { .cmd_per_lun = ARCMSR_MAX_CMD_PERLUN, .use_clustering = ENABLE_CLUSTERING, .shost_attrs = arcmsr_host_attrs, + .no_write_same = 1, };static struct pci_device_id arcmsr_device_id_table[] = { {PCI_DEVICE (PCI_VENDOR_ID_ARECA ,PCI_DEVICE_ID_ARECA_1110 )},
drivers/scsi/bfa/bfa_fcs.h +1 -0
@@ -296,6 +296,7 @@ wwn_t bfa_fcs_lport_get_rport(struct bfa_fcs_lport_s *port, wwn_t wwn,struct bfa_fcs_lport_s *bfa_fcs_lookup_port (struct bfa_fcs_s *fcs,u16 vf_id,wwn_t lpwwn); +void bfa_fcs_lport_set_symname (struct bfa_fcs_lport_s *port,char *symname);void bfa_fcs_lport_get_info (struct bfa_fcs_lport_s *port,struct bfa_lport_info_s *port_info); void bfa_fcs_lport_get_attr(struct bfa_fcs_lport_s *port,
drivers/scsi/bfa/bfa_fcs_lport.c +11 -3
@@ -1097,6 +1097,17 @@ bfa_fcs_lport_init(struct bfa_fcs_lport_s *lport,bfa_sm_send_event (lport,BFA_FCS_PORT_SM_CREATE ); } +void +bfa_fcs_lport_set_symname (struct bfa_fcs_lport_s *port, +char *symname) +{ +strcpy (port->port_cfg.sym_name.symname, symname); + +if (bfa_sm_cmp_state (port, bfa_fcs_lport_sm_online)) +bfa_fcs_lport_ns_util_send_rspn_id ( +BFA_FCS_GET_NS_FROM_PORT (port),NULL ); +} +/* * fcs_lport_api */
@@ -5140,9 +5151,6 @@ bfa_fcs_lport_ns_util_send_rspn_id(void *cbarg, struct bfa_fcxp_s *fcxp_alloced)u8 *psymbl = &symbl[0 ];int len; -if (!bfa_sm_cmp_state (port, bfa_fcs_lport_sm_online)) -return ; -/* Avoid sending RSPN in the following states. */ if (bfa_sm_cmp_state(ns, bfa_fcs_lport_ns_sm_offline) || bfa_sm_cmp_state(ns, bfa_fcs_lport_ns_sm_plogi_sending) ||
drivers/scsi/bfa/bfad_attr.c +2 -5
@@ -593,11 +593,8 @@ bfad_im_vport_set_symbolic_name(struct fc_vport *fc_vport)return ;spin_lock_irqsave (&bfad->bfad_lock, flags); -if (strlen (sym_name) >0 ) { -strcpy (fcs_vport->lport.port_cfg.sym_name.symname, sym_name); -bfa_fcs_lport_ns_util_send_rspn_id ( -BFA_FCS_GET_NS_FROM_PORT ((&fcs_vport->lport)),NULL ); - } +if (strlen (sym_name) >0 ) +bfa_fcs_lport_set_symname (&fcs_vport->lport, sym_name);spin_unlock_irqrestore (&bfad->bfad_lock, flags); }
drivers/scsi/gdth.c +1 -0
@@ -4686,6 +4686,7 @@ static struct scsi_host_template gdth_template = { .cmd_per_lun = GDTH_MAXC_P_L, .unchecked_isa_dma = 1, .use_clustering = ENABLE_CLUSTERING, + .no_write_same = 1, };#ifdef CONFIG_ISA
drivers/scsi/hosts.c +1 -0
@@ -388,6 +388,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) shost->unchecked_isa_dma = sht->unchecked_isa_dma; shost->use_clustering = sht->use_clustering; shost->ordered_tag = sht->ordered_tag; + shost->no_write_same = sht->no_write_same;if (sht->supported_mode ==MODE_UNKNOWN )/* means we didn't set it ... default to INITIATOR */
drivers/scsi/hpsa.c +3 -2
@@ -562,6 +562,7 @@ static struct scsi_host_template hpsa_driver_template = { .sdev_attrs = hpsa_sdev_attrs, .shost_attrs = hpsa_shost_attrs, .max_sectors = 8192, + .no_write_same = 1, };
@@ -1289,7 +1290,7 @@ static void complete_scsi_command(struct CommandList *cp)"has check condition: aborted command: " "ASC: 0x%x, ASCQ: 0x%x\n" , cp, asc, ascq); - cmd->result =DID_SOFT_ERROR <<16 ; + cmd->result |=DID_SOFT_ERROR <<16 ;break ; }/* Must be some other type of check condition */
@@ -4926,7 +4927,7 @@ reinit_after_soft_reset:hpsa_hba_inquiry (h);hpsa_register_scsi (h);/* hook ourselves into SCSI subsystem */ start_controller_lockup_detector (h); -return 1 ; +return 0 ; clean4:hpsa_free_sg_chain_blocks (h);
drivers/scsi/ipr.c +2 -1
@@ -6305,7 +6305,8 @@ static struct scsi_host_template driver_template = { .use_clustering = ENABLE_CLUSTERING, .shost_attrs = ipr_ioa_attrs, .sdev_attrs = ipr_dev_attrs, - .proc_name = IPR_NAME + .proc_name = IPR_NAME, + .no_write_same = 1, };/**
drivers/scsi/ips.c +1 -0
@@ -374,6 +374,7 @@ static struct scsi_host_template ips_driver_template = { .sg_tablesize = IPS_MAX_SG, .cmd_per_lun = 3, .use_clustering = ENABLE_CLUSTERING, + .no_write_same = 1, };
drivers/scsi/libsas/sas_ata.c +1 -1
@@ -211,7 +211,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc) qc->tf.nsect =0 ; } -ata_tf_to_fis (&qc->tf,1 ,0 , (u8 *)&task->ata_task.fis); +ata_tf_to_fis (&qc->tf, qc->dev->link->pmp,1 , (u8 *)&task->ata_task.fis); task->uldd_task = qc;if (ata_is_atapi (qc->tf.protocol)) {memcpy (task->ata_task.atapi_packet, qc->cdb, qc->dev->cdb_len);
drivers/scsi/megaraid.c +1 -0
@@ -4244,6 +4244,7 @@ static struct scsi_host_template megaraid_template = { .eh_device_reset_handler = megaraid_reset, .eh_bus_reset_handler = megaraid_reset, .eh_host_reset_handler = megaraid_reset, + .no_write_same = 1, }; static int
drivers/scsi/megaraid/megaraid_mbox.c +1 -0
@@ -367,6 +367,7 @@ static struct scsi_host_template megaraid_template_g = { .eh_host_reset_handler = megaraid_reset_handler, .change_queue_depth = megaraid_change_queue_depth, .use_clustering = ENABLE_CLUSTERING, + .no_write_same = 1, .sdev_attrs = megaraid_sdev_attrs, .shost_attrs = megaraid_shost_attrs, };
drivers/scsi/megaraid/megaraid_sas_base.c +1 -0
@@ -2148,6 +2148,7 @@ static struct scsi_host_template megasas_template = { .bios_param = megasas_bios_param, .use_clustering = ENABLE_CLUSTERING, .change_queue_depth = megasas_change_queue_depth, + .no_write_same = 1, };/**
drivers/scsi/pmcraid.c +1 -0
@@ -4314,6 +4314,7 @@ static struct scsi_host_template pmcraid_host_template = { .this_id = -1, .sg_tablesize = PMCRAID_MAX_IOADLS, .max_sectors = PMCRAID_IOA_MAX_SECTORS, + .no_write_same = 1, .cmd_per_lun = PMCRAID_MAX_CMD_PER_LUN, .use_clustering = ENABLE_CLUSTERING, .shost_attrs = pmcraid_host_attrs,
drivers/scsi/sd.c +6 -0
@@ -2638,6 +2638,12 @@ static void sd_read_write_same(struct scsi_disk *sdkp, unsigned char *buffer) {struct scsi_device *sdev = sdkp->device; +if (sdev->host->no_write_same) { + sdev->no_write_same =1 ; + +return ; + } +if (scsi_report_opcode (sdev, buffer,SD_BUF_SIZE ,INQUIRY ) <0 ) { sdev->no_report_opcodes =1 ;
drivers/scsi/storvsc_drv.c +1 -0
@@ -1697,6 +1697,7 @@ static struct scsi_host_template scsi_driver = { .use_clustering = DISABLE_CLUSTERING, /* Make sure we dont get a sg segment crosses a page boundary */ .dma_boundary = PAGE_SIZE-1, + .no_write_same = 1, };enum {
drivers/spi/spi-pxa2xx.c +2 -0
@@ -1077,6 +1077,8 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev)static struct acpi_device_id pxa2xx_spi_acpi_match[] = { {"INT33C0" ,0 }, {"INT33C1" ,0 }, + {"INT3430" ,0 }, + {"INT3431" ,0 }, {"80860F0E" ,0 }, { }, };
drivers/tty/n_tty.c +4 -2
@@ -810,7 +810,8 @@ static void process_echoes(struct tty_struct *tty)struct n_tty_data *ldata = tty->disc_data;size_t echoed; -if (!L_ECHO (tty) || ldata->echo_commit == ldata->echo_tail) +if ((!L_ECHO (tty) && !L_ECHONL (tty)) || + ldata->echo_commit == ldata->echo_tail)return ;mutex_lock (&ldata->output_lock);
@@ -825,7 +826,8 @@ static void flush_echoes(struct tty_struct *tty) {struct n_tty_data *ldata = tty->disc_data; -if (!L_ECHO (tty) || ldata->echo_commit == ldata->echo_head) +if ((!L_ECHO (tty) && !L_ECHONL (tty)) || + ldata->echo_commit == ldata->echo_head)return ;mutex_lock (&ldata->output_lock);
drivers/usb/class/cdc-acm.c +2 -0
@@ -1515,6 +1515,8 @@ static int acm_reset_resume(struct usb_interface *intf)static const struct usb_device_id acm_ids[] = {/* quirky and broken devices */ + {USB_DEVICE (0x17ef ,0x7000 ),/* Lenovo USB modem */ + .driver_info =NO_UNION_NORMAL , },/* has no union descriptor */ {USB_DEVICE (0x0870 ,0x0001 ),/* Metricom GS Modem */ .driver_info =NO_UNION_NORMAL ,/* has no union descriptor */ },
drivers/usb/serial/ftdi_sio.c +24 -13
@@ -2115,6 +2115,20 @@ static void ftdi_set_termios(struct tty_struct *tty, termios->c_cflag |=CRTSCTS ; } +/* +* All FTDI UART chips are limited to CS7/8. We won't pretend to +* support CS5/6 and revert the CSIZE setting instead. +*/ +if ((C_CSIZE (tty) !=CS8 ) && (C_CSIZE (tty) !=CS7 )) { +dev_warn (ddev,"requested CSIZE setting not supported\n" ); + + termios->c_cflag &= ~CSIZE ; +if (old_termios) + termios->c_cflag |= old_termios->c_cflag &CSIZE ; +else + termios->c_cflag |=CS8 ; + } + cflag = termios->c_cflag;if (!old_termios)
@@ -2151,19 +2165,16 @@ no_skip: }else { urb_value |=FTDI_SIO_SET_DATA_PARITY_NONE ; } -if (cflag &CSIZE ) { -switch (cflag &CSIZE ) { -case CS7 : - urb_value |=7 ; -dev_dbg (ddev,"Setting CS7\n" ); -break ; -case CS8 : - urb_value |=8 ; -dev_dbg (ddev,"Setting CS8\n" ); -break ; -default : -dev_err (ddev,"CSIZE was set but not CS7-CS8\n" ); - } +switch (cflag &CSIZE ) { +case CS7 : + urb_value |=7 ; +dev_dbg (ddev,"Setting CS7\n" ); +break ; +default : +case CS8 : + urb_value |=8 ; +dev_dbg (ddev,"Setting CS8\n" ); +break ; }/* This is needed by the break command since it uses the same command
drivers/usb/serial/mos7840.c +16 -16
@@ -1813,25 +1813,25 @@ static void mos7840_change_port_settings(struct tty_struct *tty, iflag = tty->termios.c_iflag;/* Change the number of bits */ -if (cflag &CSIZE ) { -switch (cflag &CSIZE ) { -case CS5 : - lData =LCR_BITS_5 ; -break ; +switch (cflag &CSIZE ) { +case CS5 : + lData =LCR_BITS_5 ; +break ; -case CS6 : - lData =LCR_BITS_6 ; -break ; +case CS6 : + lData =LCR_BITS_6 ; +break ; -case CS7 : - lData =LCR_BITS_7 ; -break ; -default : -case CS8 : - lData =LCR_BITS_8 ; -break ; - } +case CS7 : + lData =LCR_BITS_7 ; +break ; + +default : +case CS8 : + lData =LCR_BITS_8 ; +break ; } +/* Change the Parity bit */ if (cflag &PARENB ) {if (cflag &PARODD ) {
drivers/usb/serial/pl2303.c +14 -16
@@ -361,23 +361,21 @@ static void pl2303_set_termios(struct tty_struct *tty, 0, 0, buf, 7, 100);dev_dbg (&port->dev,"0xa1:0x21:0:0 %d - %7ph\n" , i, buf); -if (C_CSIZE (tty)) { -switch (C_CSIZE (tty)) { -case CS5 : - buf[6 ] =5 ; -break ; -case CS6 : - buf[6 ] =6 ; -break ; -case CS7 : - buf[6 ] =7 ; -break ; -default : -case CS8 : - buf[6 ] =8 ; - } -dev_dbg (&port->dev,"data bits = %d\n" , buf[6 ]); +switch (C_CSIZE (tty)) { +case CS5 : + buf[6 ] =5 ; +break ; +case CS6 : + buf[6 ] =6 ; +break ; +case CS7 : + buf[6 ] =7 ; +break ; +default : +case CS8 : + buf[6 ] =8 ; } +dev_dbg (&port->dev,"data bits = %d\n" , buf[6 ]);/* For reference buf[0]:buf[3] baud rate value */ pl2303_encode_baudrate (tty, port, &buf[0 ]);
drivers/usb/serial/spcp8x5.c +14 -16
@@ -348,22 +348,20 @@ static void spcp8x5_set_termios(struct tty_struct *tty, }/* Set Data Length : 00:5bit, 01:6bit, 10:7bit, 11:8bit */ -if (cflag &CSIZE ) { -switch (cflag &CSIZE ) { -case CS5 : - buf[1 ] |=SET_UART_FORMAT_SIZE_5 ; -break ; -case CS6 : - buf[1 ] |=SET_UART_FORMAT_SIZE_6 ; -break ; -case CS7 : - buf[1 ] |=SET_UART_FORMAT_SIZE_7 ; -break ; -default : -case CS8 : - buf[1 ] |=SET_UART_FORMAT_SIZE_8 ; -break ; - } +switch (cflag &CSIZE ) { +case CS5 : + buf[1 ] |=SET_UART_FORMAT_SIZE_5 ; +break ; +case CS6 : + buf[1 ] |=SET_UART_FORMAT_SIZE_6 ; +break ; +case CS7 : + buf[1 ] |=SET_UART_FORMAT_SIZE_7 ; +break ; +default : +case CS8 : + buf[1 ] |=SET_UART_FORMAT_SIZE_8 ; +break ; }/* Set Stop bit2 : 0:1bit 1:2bit */
drivers/video/omap2/displays-new/panel-sony-acx565akm.c +2 -3
@@ -526,6 +526,8 @@ static int acx565akm_panel_power_on(struct omap_dss_device *dssdev)struct omap_dss_device *in = ddata->in;int r; +mutex_lock (&ddata->mutex); +dev_dbg (&ddata->spi->dev,"%s\n" , __func__); in->ops.sdi->set_timings (in, &ddata->videomode);
@@ -614,10 +616,7 @@ static int acx565akm_enable(struct omap_dss_device *dssdev)if (omapdss_device_is_enabled (dssdev))return 0 ; -mutex_lock (&ddata->mutex); r =acx565akm_panel_power_on (dssdev); -mutex_unlock (&ddata->mutex); -if (r)return r;
drivers/xen/grant-table.c +4 -2
@@ -921,9 +921,10 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, ret =m2p_add_override (mfn, pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();
@@ -954,9 +955,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, ret =m2p_remove_override (pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();
fs/nfs/nfs4proc.c +8 -2
@@ -4938,11 +4938,17 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata)trace_nfs4_delegreturn_exit (&data->args, &data->res, task->tk_status);switch (task->tk_status) { -case -NFS4ERR_STALE_STATEID : -case -NFS4ERR_EXPIRED :case 0 :renew_lease (data->res.server, data->timestamp);break ; +case -NFS4ERR_ADMIN_REVOKED : +case -NFS4ERR_DELEG_REVOKED : +case -NFS4ERR_BAD_STATEID : +case -NFS4ERR_OLD_STATEID : +case -NFS4ERR_STALE_STATEID : +case -NFS4ERR_EXPIRED : + task->tk_status =0 ; +break ;default :if (nfs4_async_handle_error (task, data->res.server,NULL ) == -EAGAIN ) {
fs/pipe.c +19 -20
@@ -726,11 +726,25 @@ pipe_poll(struct file *filp, poll_table *wait)return mask; } +static void put_pipe_info (struct inode *inode,struct pipe_inode_info *pipe) +{ +int kill =0 ; + +spin_lock (&inode->i_lock); +if (!--pipe->files) { + inode->i_pipe =NULL ; + kill =1 ; + } +spin_unlock (&inode->i_lock); + +if (kill) +free_pipe_info (pipe); +} +static int pipe_release (struct inode *inode,struct file *file) { -struct pipe_inode_info *pipe = inode->i_pipe; -int kill =0 ; +struct pipe_inode_info *pipe = file->private_data;__pipe_lock (pipe);if (file->f_mode &FMODE_READ )
@@ -743,17 +757,9 @@ pipe_release(struct inode *inode, struct file *file)kill_fasync (&pipe->fasync_readers,SIGIO ,POLL_IN );kill_fasync (&pipe->fasync_writers,SIGIO ,POLL_OUT ); } -spin_lock (&inode->i_lock); -if (!--pipe->files) { - inode->i_pipe =NULL ; - kill =1 ; - } -spin_unlock (&inode->i_lock);__pipe_unlock (pipe); -if (kill) -free_pipe_info (pipe); - +put_pipe_info (inode, pipe);return 0 ; }
@@ -1014,7 +1020,6 @@ static int fifo_open(struct inode *inode, struct file *filp) {struct pipe_inode_info *pipe;bool is_pipe = inode->i_sb->s_magic ==PIPEFS_MAGIC ; -int kill =0 ;int ret; filp->f_version =0 ;
@@ -1130,15 +1135,9 @@ err_wr: goto err; err: -spin_lock (&inode->i_lock); -if (!--pipe->files) { - inode->i_pipe =NULL ; - kill =1 ; - } -spin_unlock (&inode->i_lock);__pipe_unlock (pipe); -if (kill) -free_pipe_info (pipe); + +put_pipe_info (inode, pipe);return ret; }
include/crypto/scatterwalk.h +2 -1
@@ -36,6 +36,7 @@ static inline void scatterwalk_sg_chain(struct scatterlist *sg1, int num, {sg_set_page (&sg1[num -1 ], (void *)sg2,0 ,0 ); sg1[num -1 ].page_link &= ~0x02 ; + sg1[num -1 ].page_link |=0x01 ; }static inline struct scatterlist *scatterwalk_sg_next (struct scatterlist *sg)
@@ -43,7 +44,7 @@ static inline struct scatterlist *scatterwalk_sg_next(struct scatterlist *sg)if (sg_is_last (sg))return NULL ; -return (++sg)->length ? sg : (void *)sg_page (sg); +return (++sg)->length ? sg :sg_chain_ptr (sg); } static inline void scatterwalk_crypto_chain(struct scatterlist *head,
include/linux/efi.h +4 -0
@@ -782,6 +782,8 @@ struct efivar_entry {struct efi_variable var;struct list_head list;struct kobject kobj; +bool scanning; +bool deleting; };extern struct list_head efivar_sysfs_list;
@@ -840,6 +842,8 @@ void efivar_run_worker(void);#if defined(CONFIG_EFI_VARS ) || defined(CONFIG_EFI_VARS_MODULE )int efivars_sysfs_init (void ); +#define EFIVARS_DATA_SIZE_MAX 1024 +#endif /* CONFIG_EFI_VARS */ #endif /* _LINUX_EFI_H */
include/scsi/scsi_host.h +6 -0
@@ -475,6 +475,9 @@ struct scsi_host_template {*/ unsigned ordered_tag:1; +/* True if the controller does not support WRITE SAME */ + unsigned no_write_same:1; +/* * Countdown for host blocking with no commands outstanding. */
@@ -674,6 +677,9 @@ struct Scsi_Host {/* Don't resume host in EH */ unsigned eh_noresume:1; +/* The controller does not support WRITE SAME */ + unsigned no_write_same:1; +/* * Optional work queue to be utilized by the transport */
include/sound/soc-dapm.h +2 -1
@@ -104,7 +104,8 @@ struct device; SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ .kcontrol_news = wcontrols, .num_kcontrols = 1}#define SND_SOC_DAPM_MUX (wname, wreg, wshift, winvert, wcontrols) \ -{ .id = snd_soc_dapm_mux, .name = wname, .reg = wreg, \ +{ .id = snd_soc_dapm_mux, .name = wname, \ + SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ .kcontrol_news = wcontrols, .num_kcontrols = 1}#define SND_SOC_DAPM_VIRT_MUX (wname, wreg, wshift, winvert, wcontrols) \ { .id = snd_soc_dapm_virt_mux, .name = wname, \
kernel/irq/pm.c +1 -1
@@ -50,7 +50,7 @@ static void resume_irqs(bool want_early)bool is_early = desc->action && desc->action->flags &IRQF_EARLY_RESUME ; -if (is_early != want_early) +if (!is_early && want_early)continue ;raw_spin_lock_irqsave (&desc->lock, flags);
kernel/time/timekeeping.c +1 -1
@@ -1347,7 +1347,7 @@ static inline void old_vsyscall_fixup(struct timekeeper *tk) tk->xtime_nsec -= remainder; tk->xtime_nsec +=1ULL << tk->shift; tk->ntp_error += remainder << tk->ntp_error_shift; - + tk->ntp_error -= (1ULL << tk->shift) << tk->ntp_error_shift; }#else #define old_vsyscall_fixup (tk)
net/ipv4/udp.c +3 -0
@@ -1075,6 +1075,9 @@ int udp_sendpage(struct sock *sk, struct page *page, int offset,if (flags &MSG_SENDPAGE_NOTLAST ) flags |=MSG_MORE ; +if (flags &MSG_SENDPAGE_NOTLAST ) + flags |=MSG_MORE ; +if (!up->pending) {struct msghdr msg = { .msg_flags = flags|MSG_MORE };
sound/pci/hda/patch_analog.c +4 -0
@@ -345,6 +345,9 @@ static int patch_ad1986a(struct hda_codec *codec)*/ spec->gen.multiout.no_share_stream =1 ; +/* AD1986A can't manage the dynamic pin on/off smoothly */ + spec->gen.auto_mute_via_amp =1 ; +snd_hda_pick_fixup (codec, ad1986a_fixup_models, ad1986a_fixup_tbl, ad1986a_fixups);snd_hda_apply_fixup (codec,HDA_FIXUP_ACT_PRE_PROBE );
@@ -961,6 +964,7 @@ static void ad1884_fixup_hp_eapd(struct hda_codec *codec,switch (action) {case HDA_FIXUP_ACT_PRE_PROBE : spec->gen.vmaster_mute.hook = ad1884_vmaster_hp_gpio_hook; + spec->gen.own_eapd_ctl =1 ;snd_hda_sequence_write_cache (codec, gpio_init_verbs);break ;case HDA_FIXUP_ACT_PROBE :
sound/pci/hda/patch_realtek.c +47 -8
123 lines not on this page · raw message
sound/soc/codecs/wm8731.c +2 -2
@@ -447,10 +447,10 @@ static int wm8731_set_dai_fmt(struct snd_soc_dai *codec_dai, iface |=0x0001 ;break ;case SND_SOC_DAIFMT_DSP_A : - iface |=0x0003 ; + iface |=0x0013 ;break ;case SND_SOC_DAIFMT_DSP_B : - iface |=0x0013 ; + iface |=0x0003 ;break ;default :return -EINVAL ;
sound/soc/codecs/wm8990.c +2 -0
@@ -1259,6 +1259,8 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec,/* disable POBCTRL, SOFT_ST and BUFDCOPEN */ snd_soc_write (codec,WM8990_ANTIPOP2 ,0x0 ); + + codec->cache_sync =1 ;break ; }