Linux 4.19.22
Greg KH
maintainerI'm announcing the release of the 4.19.22 kernel.
Don't use this, use 4.19.23 instead.
The updated 4.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.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/da850.dtsi | 2 arch/arm/mach-iop32x/n2100.c | 3 arch/arm/mach-tango/pm.c | 6 - arch/arm/mach-tango/pm.h | 7 + arch/arm/mach-tango/setup.c | 2 arch/mips/kernel/mips-cm.c | 2 arch/mips/loongson64/common/reset.c | 7 + arch/mips/pci/pci-octeon.c | 10 +- arch/mips/vdso/Makefile | 5 - arch/powerpc/include/asm/book3s/64/pgtable.h | 22 +--- arch/powerpc/mm/pgtable-book3s64.c | 22 ++++ drivers/ata/libata-core.c | 1 drivers/firmware/arm_scmi/bus.c | 9 + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 1 drivers/gpu/drm/drm_modes.c | 2 drivers/gpu/drm/i915/intel_ddi.c | 2 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 9 + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 drivers/iio/adc/axp288_adc.c | 76 ++++++++++++--- drivers/iio/adc/ti-ads8688.c | 3 drivers/iio/chemical/atlas-ph-sensor.c | 7 - drivers/misc/mei/hw-me-regs.h | 2 drivers/misc/mei/pci-me.c | 2 drivers/misc/mic/vop/vop_main.c | 4 drivers/misc/vexpress-syscfg.c | 2 drivers/mtd/mtdpart.c | 4 drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c | 13 +- drivers/mtd/nand/spi/core.c | 46 ++++----- drivers/pinctrl/intel/pinctrl-cherryview.c | 8 - drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c | 2 fs/debugfs/inode.c | 7 + fs/ext4/fsync.c | 13 -- include/linux/sunrpc/xprt.h | 5 + kernel/signal.c | 58 +++++++++++- kernel/trace/trace_uprobe.c | 2 net/batman-adv/hard-interface.c | 5 - net/batman-adv/soft-interface.c | 2 net/ceph/messenger.c | 5 - net/mac80211/tx.c | 12 +- net/sunrpc/clnt.c | 6 - net/sunrpc/xprtrdma/svc_rdma_sendto.c | 105 ++++++++++++++++++++-- net/sunrpc/xprtrdma/svc_rdma_transport.c | 13 +- net/xfrm/xfrm_policy.c | 5 - net/xfrm/xfrm_user.c | 13 +- samples/mei/mei-amt-version.c | 2 tools/iio/iio_generic_buffer.c | 2 47 files changed, 401 insertions(+), 139 deletions(-)
Aaro Koskinen (1):
MIPS: OCTEON: don't set octeon_dma_bar_type if PCI is disabled
Andreas Ziegler (1):
tracing: uprobes: Fix typo in pr_fmt string
Aneesh Kumar K.V (1):
powerpc/radix: Fix kernel crash with mremap()
Bartosz Golaszewski (1):
ARM: dts: da850: fix interrupt numbers for clocksource
Benedict Wong (1):
xfrm: Make set-mark default behavior backward compatible
Benjamin Coddington (1):
SUNRPC: Always drop the XPRT_LOCK on XPRT_CLOSE_WAIT
Boris Brezillon (3):
mtd: Make sure mtd->erasesize is valid even if the partition is of size 0
mtd: spinand: Handle the case where PROGRAM LOAD does not reset the cache
mtd: spinand: Fix the error/cleanup path in spinand_init()
Chen-Yu Tsai (1):
pinctrl: sunxi: Correct number of IRQ banks on H6 main pin controller
Chuck Lever (2):
svcrdma: Reduce max_send_sges
svcrdma: Remove max_sge check at connect time
Dan Carpenter (1):
misc: vexpress: Off by one in vexpress_syscfg_exec()
Dan Murphy (1):
iio: ti-ads8688: Update buffer allocation for timestamps
Dmitry Torokhov (1):
pinctrl: cherryview: fix Strago DMI workaround
Eric W. Biederman (2):
signal: Always notice exiting tasks
signal: Better detection of synchronous signals
Felix Fietkau (1):
mac80211: ensure that mgmt tx skbs have tailroom for encryption
Florian Westphal (1):
xfrm: refine validation of template and selector families
Greg Kroah-Hartman (2):
debugfs: fix debugfs_rename parameter checking Linux 4.19.22
Gustavo A. R. Silva (1):
drm/amd/powerplay: Fix missing break in switch
Hans de Goede (2):
libata: Add NOLPM quirk for SAMSUNG MZ7TE512HMHP-000L1 SSD
iio: adc: axp288: Fix TS-pin handling
Ilya Dryomov (1):
libceph: avoid KEEPALIVE_PENDING races in ceph_con_keepalive()
Lucas De Marchi (1):
drm/i915: always return something on DDI clock selection
Marc Gonzalez (1):
ARM: tango: Improve ARCH_MULTIPLATFORM compatibility
Martin Kelly (1):
tools: iio: iio_generic_buffer: make num_loops signed
Martin Kepplinger (1):
mtd: rawnand: gpmi: fix MX28 bus master lockup problem
Matt Ranostay (1):
iio: chemical: atlas-ph-sensor: correct IIO_TEMP values to millicelsius
Paul Burton (2):
MIPS: VDSO: Use same -m%-float cflag as the kernel proper
MIPS: VDSO: Include $(ccflags-vdso) in o32,n32 .lds builds
Russell King (1):
ARM: iop32x/n2100: fix PCI IRQ mapping
Sudeep Holla (1):
firmware: arm_scmi: provide the mandatory device release callback
Sven Eckelmann (2):
batman-adv: Avoid WARN on net_device without parent in netns
batman-adv: Force mac header to start of data on xmit
Theodore Ts'o (1):
Revert "ext4: use ext4_write_inode() when fsyncing w/o a journal"
Thomas Hellstrom (2):
drm/vmwgfx: Fix setting of dma masks
drm/vmwgfx: Return error code from vmw_execbuf_copy_fence_user
Tina Zhang (1):
drm/modes: Prevent division by zero htotal
Tomas Winkler (2):
mei: me: add ice lake point device id.
samples: mei: use /dev/mei0 instead of /dev/mei
Vincent Whitchurch (1):
mic: vop: Fix use-after-free on remove
Vladimir Kondratiev (1):
mips: cm: reprime error cause
Yifeng Li (1):
mips: loongson64: remove unreachable(), fix loongson_poweroff().
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 19 -SUBLEVEL = 21 +SUBLEVEL = 22 EXTRAVERSION = NAME = "People's Front"
arch/arm/boot/dts/da850.dtsi +1 -1
@@ -476,7 +476,7 @@ clocksource: timer@20000 { compatible = "ti,da830-timer"; reg = <0x20000 0x1000>; - interrupts = <12>, <13>; + interrupts = <21>, <22>; interrupt-names = "tint12", "tint34"; clocks = <&pll0_auxclk>; };
arch/arm/mach-iop32x/n2100.c +1 -2
@@ -75,8 +75,7 @@ void __init n2100_map_io(void)/* * N2100 PCI. */ -static int __init -n2100_pci_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +static int n2100_pci_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {int irq;
arch/arm/mach-tango/pm.c +2 -4
@@ -3,6 +3,7 @@#include <linux/suspend.h> #include <asm/suspend.h> #include "smc.h" +#include "pm.h" static int tango_pm_powerdown (unsigned long arg) {
@@ -24,10 +25,7 @@ static const struct platform_suspend_ops tango_pm_ops = { .valid = suspend_valid_only_mem, }; -static int __init tango_pm_init (void ) +void __init tango_pm_init (void ) {suspend_set_ops (&tango_pm_ops); -return 0 ; } - -late_initcall (tango_pm_init);
arch/arm/mach-tango/pm.h new file +7 -0
@@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifdef CONFIG_SUSPEND +void __init tango_pm_init (void ); +#else +#define tango_pm_init NULL +#endif
arch/arm/mach-tango/setup.c +2 -0
@@ -2,6 +2,7 @@#include <asm/mach/arch.h> #include <asm/hardware/cache-l2x0.h> #include "smc.h" +#include "pm.h" static void tango_l2c_write (unsigned long val,unsigned int reg) {
@@ -15,4 +16,5 @@ DT_MACHINE_START(TANGO_DT, "Sigma Tango DT") .dt_compat = tango_dt_compat, .l2c_aux_mask = ~0, .l2c_write_sec = tango_l2c_write, + .init_late = tango_pm_init,MACHINE_END
arch/mips/kernel/mips-cm.c +1 -1
@@ -457,5 +457,5 @@ void mips_cm_error_report(void) }/* reprime cause register */ -write_gcr_error_cause (0 ); +write_gcr_error_cause (cm_error); }
arch/mips/loongson64/common/reset.c +6 -1
@@ -59,7 +59,12 @@ static void loongson_poweroff(void) {#ifndef CONFIG_LEFI_FIRMWARE_INTERFACE mach_prepare_shutdown (); -unreachable (); + +/* +* It needs a wait loop here, but mips/kernel/reset.c already calls +* a generic delay loop, machine_hang(), so simply return. +*/ +return ;#else void (*fw_poweroff)(void ) = (void *)loongson_sysconf.poweroff_addr;
arch/mips/pci/pci-octeon.c +5 -5
@@ -568,6 +568,11 @@ static int __init octeon_pci_setup(void)if (octeon_has_feature (OCTEON_FEATURE_PCIE ))return 0 ; +if (!octeon_is_pci_host ()) { +pr_notice ("Not in host mode, PCI Controller not initialized\n" ); +return 0 ; + } +/* Point pcibios_map_irq() to the PCI version of it */ octeon_pcibios_map_irq = octeon_pci_pcibios_map_irq;
@@ -579,11 +584,6 @@ static int __init octeon_pci_setup(void)else octeon_dma_bar_type =OCTEON_DMA_BAR_TYPE_BIG ; -if (!octeon_is_pci_host ()) { -pr_notice ("Not in host mode, PCI Controller not initialized\n" ); -return 0 ; - } -/* PCI I/O and PCI MEM values */ set_io_port_base (OCTEON_PCI_IOSPACE_BASE ); ioport_resource.start =0 ;
arch/mips/vdso/Makefile +3 -2
@@ -8,6 +8,7 @@ ccflags-vdso := \ $(filter -E%,$(KBUILD_CFLAGS)) \ $(filter -mmicromips,$(KBUILD_CFLAGS)) \ $(filter -march=%,$(KBUILD_CFLAGS)) \ + $(filter -m%-float,$(KBUILD_CFLAGS)) \ -D__VDSO__ ifeq ($(cc-name),clang)
@@ -128,7 +129,7 @@ $(obj)/%-o32.o: $(src)/%.c FORCE $(call cmd,force_checksrc) $(call if_changed_rule,cc_o_c) -$(obj)/vdso-o32.lds: KBUILD_CPPFLAGS := -mabi=32 +$(obj)/vdso-o32.lds: KBUILD_CPPFLAGS := $(ccflags-vdso) -mabi=32 $(obj)/vdso-o32.lds: $(src)/vdso.lds.S FORCE $(call if_changed_dep,cpp_lds_S)
@@ -168,7 +169,7 @@ $(obj)/%-n32.o: $(src)/%.c FORCE $(call cmd,force_checksrc) $(call if_changed_rule,cc_o_c) -$(obj)/vdso-n32.lds: KBUILD_CPPFLAGS := -mabi=n32 +$(obj)/vdso-n32.lds: KBUILD_CPPFLAGS := $(ccflags-vdso) -mabi=n32 $(obj)/vdso-n32.lds: $(src)/vdso.lds.S FORCE $(call if_changed_dep,cpp_lds_S)
arch/powerpc/include/asm/book3s/64/pgtable.h +7 -15
@@ -1234,21 +1234,13 @@ extern pmd_t pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,#define pmd_move_must_withdraw pmd_move_must_withdrawstruct spinlock ; -static inline int pmd_move_must_withdraw (struct spinlock *new_pmd_ptl, -struct spinlock *old_pmd_ptl, -struct vm_area_struct *vma) -{ -if (radix_enabled ()) -return false; -/* -* Archs like ppc64 use pgtable to store per pmd -* specific information. So when we switch the pmd, -* we should also withdraw and deposit the pgtable -*/ -return true; -} - - +extern int pmd_move_must_withdraw (struct spinlock *new_pmd_ptl, +struct spinlock *old_pmd_ptl, +struct vm_area_struct *vma); +/* +* Hash translation mode use the deposited table to store hash pte +* slot information. +*/ #define arch_needs_pgtable_deposit arch_needs_pgtable_depositstatic inline bool arch_needs_pgtable_deposit (void ) {
arch/powerpc/mm/pgtable-book3s64.c +22 -0
@@ -477,3 +477,25 @@ void arch_report_meminfo(struct seq_file *m) atomic_long_read(&direct_pages_count[MMU_PAGE_1G]) << 20); }#endif /* CONFIG_PROC_FS */ + +/* +* For hash translation mode, we use the deposited table to store hash slot +* information and they are stored at PTRS_PER_PMD offset from related pmd +* location. Hence a pmd move requires deposit and withdraw. +* +* For radix translation with split pmd ptl, we store the deposited table in the +* pmd page. Hence if we have different pmd page we need to withdraw during pmd +* move. +* +* With hash we use deposited table always irrespective of anon or not. +* With radix we use deposited table only for anonymous mapping. +*/ +int pmd_move_must_withdraw (struct spinlock *new_pmd_ptl, +struct spinlock *old_pmd_ptl, +struct vm_area_struct *vma) +{ +if (radix_enabled ()) +return (new_pmd_ptl != old_pmd_ptl) &&vma_is_anonymous (vma); + +return true; +}
drivers/ata/libata-core.c +1 -0
@@ -4554,6 +4554,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "SAMSUNG MZMPC128HBFU-000MV", "CXM14M1Q", ATA_HORKAGE_NOLPM, }, { "SAMSUNG SSD PM830 mSATA *", "CXM13D1Q", ATA_HORKAGE_NOLPM, }, { "SAMSUNG MZ7TD256HAFV-000L9", NULL, ATA_HORKAGE_NOLPM, }, + { "SAMSUNG MZ7TE512HMHP-000L1", "EXT06L0Q", ATA_HORKAGE_NOLPM, }, /* devices that don't properly handle queued TRIM commands */ { "Micron_M500IT_*", "MU01", ATA_HORKAGE_NO_NCQ_TRIM |
drivers/firmware/arm_scmi/bus.c +7 -2
@@ -119,6 +119,11 @@ void scmi_driver_unregister(struct scmi_driver *driver) }EXPORT_SYMBOL_GPL (scmi_driver_unregister); +static void scmi_device_release (struct device *dev) +{ +kfree (to_scmi_dev (dev)); +} +struct scmi_device *scmi_device_create (struct device_node *np,struct device *parent,int protocol) {
@@ -138,6 +143,7 @@ scmi_device_create(struct device_node *np, struct device *parent, int protocol) scmi_dev->dev.parent = parent; scmi_dev->dev.of_node = np; scmi_dev->dev.bus = &scmi_bus_type; + scmi_dev->dev.release = scmi_device_release;dev_set_name (&scmi_dev->dev,"scmi_dev.%d" , id); retval =device_register (&scmi_dev->dev);
@@ -156,9 +162,8 @@ scmi_device_create(struct device_node *np, struct device *parent, int protocol)void scmi_device_destroy (struct scmi_device *scmi_dev) {scmi_handle_put (scmi_dev->handle); -device_unregister (&scmi_dev->dev);ida_simple_remove (&scmi_bus_id, scmi_dev->id); -kfree (scmi_dev); +device_unregister (&scmi_dev->dev); }void scmi_set_handle (struct scmi_device *scmi_dev)
drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +1 -0
@@ -984,6 +984,7 @@ static int smu10_get_clock_by_type_with_latency(struct pp_hwmgr *hwmgr,break ;case amd_pp_dpp_clock: pclk_vol_table = pinfo->vdd_dep_on_dppclk; +break ;default :return -EINVAL ; }
drivers/gpu/drm/drm_modes.c +1 -1
@@ -758,7 +758,7 @@ int drm_mode_hsync(const struct drm_display_mode *mode)if (mode->hsync)return mode->hsync; -if (mode->htotal <0 ) +if (mode->htotal <=0 )return 0 ; calc_val = (mode->clock *1000 ) / mode->htotal;/* hsync in Hz */
drivers/gpu/drm/i915/intel_ddi.c +1 -1
@@ -1085,7 +1085,7 @@ static uint32_t icl_pll_to_ddi_pll_sel(struct intel_encoder *encoder,return DDI_CLK_SEL_TBT_810 ;default :MISSING_CASE (clock); -break ; +return DDI_CLK_SEL_NONE ; }case DPLL_ID_ICL_MGPLL1 :case DPLL_ID_ICL_MGPLL2 :
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +6 -3
@@ -627,13 +627,16 @@ static int vmw_dma_select_mode(struct vmw_private *dev_priv)static int vmw_dma_masks (struct vmw_private *dev_priv) {struct drm_device *dev = dev_priv->dev; +int ret =0 ; -if (intel_iommu_enabled && + ret =dma_set_mask_and_coherent (dev->dev,DMA_BIT_MASK (64 )); +if (dev_priv->map_mode != vmw_dma_phys && (sizeof (unsigned long ) ==4 || vmw_restrict_dma_mask)) {DRM_INFO ("Restricting DMA addresses to 44 bits.\n" ); -return dma_set_mask (dev->dev,DMA_BIT_MASK (44 )); +return dma_set_mask_and_coherent (dev->dev,DMA_BIT_MASK (44 )); } -return 0 ; + +return ret; }#else static int vmw_dma_masks (struct vmw_private *dev_priv)
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +1 -1
@@ -3843,7 +3843,7 @@ int vmw_execbuf_fence_commands(struct drm_file *file_priv, *p_fence =NULL ; } -return 0 ; +return ret; }/**
drivers/iio/adc/axp288_adc.c +60 -16
130 lines not on this page · raw message
drivers/iio/adc/ti-ads8688.c +2 -1
@@ -41,6 +41,7 @@#define ADS8688_VREF_MV 4096#define ADS8688_REALBITS 16 +#define ADS8688_MAX_CHANNELS 8/* * enum ads8688_range - ADS8688 reference voltage range
@@ -385,7 +386,7 @@ static irqreturn_t ads8688_trigger_handler(int irq, void *p) {struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev; -u16 buffer[8 ]; +u16 buffer[ADS8688_MAX_CHANNELS +sizeof (s64)/sizeof (u16)];int i, j =0 ;for (i =0 ; i < indio_dev->masklength; i++) {
drivers/iio/chemical/atlas-ph-sensor.c +3 -4
@@ -444,9 +444,8 @@ static int atlas_read_raw(struct iio_dev *indio_dev,case IIO_CHAN_INFO_SCALE :switch (chan->type) {case IIO_TEMP : - *val =1 ;/* 0.01 */ - *val2 =100 ; -break ; + *val =10 ; +return IIO_VAL_INT ;case IIO_PH : *val =1 ;/* 0.001 */ *val2 =1000 ;
@@ -477,7 +476,7 @@ static int atlas_write_raw(struct iio_dev *indio_dev, int val, int val2, long mask) { struct atlas_data *data = iio_priv(indio_dev); -__be32 reg =cpu_to_be32 (val); +__be32 reg =cpu_to_be32 (val /10 );if (val2 !=0 || val <0 || val >20000 )return -EINVAL ;
drivers/misc/mei/hw-me-regs.h +2 -0
@@ -139,6 +139,8 @@#define MEI_DEV_ID_CNP_H 0xA360/* Cannon Point H */ #define MEI_DEV_ID_CNP_H_4 0xA364/* Cannon Point H 4 (iTouch) */ +#define MEI_DEV_ID_ICP_LP 0x34E0/* Ice Lake Point LP */ +/* * MEI HW Section */
drivers/misc/mei/pci-me.c +2 -0
@@ -105,6 +105,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = { {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H, MEI_ME_PCH8_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H_4, MEI_ME_PCH8_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)}, +/* required last entry */ {0, } };
drivers/misc/mic/vop/vop_main.c +3 -1
@@ -563,6 +563,8 @@ static int _vop_remove_device(struct mic_device_desc __iomem *d,int ret =-1 ;if (ioread8 (&dc->config_change) ==MIC_VIRTIO_PARAM_DEV_REMOVE ) { +struct device *dev =get_device (&vdev->vdev.dev); + dev_dbg(&vpdev->dev, "%s %d config_change %d type %d vdev %p\n", __func__, __LINE__,
@@ -574,7 +576,7 @@ static int _vop_remove_device(struct mic_device_desc __iomem *d,iowrite8 (-1 , &dc->h2c_vdev_db);if (status &VIRTIO_CONFIG_S_DRIVER_OK )wait_for_completion (&vdev->reset_done); -put_device (&vdev->vdev.dev); +put_device (dev);iowrite8 (1 , &dc->guest_ack);dev_dbg (&vpdev->dev,"%s %d guest_ack %d\n" , __func__, __LINE__,ioread8 (&dc->guest_ack));
drivers/misc/vexpress-syscfg.c +1 -1
@@ -61,7 +61,7 @@ static int vexpress_syscfg_exec(struct vexpress_syscfg_func *func,int tries;long timeout; -if (WARN_ON (index > func->num_templates)) +if (WARN_ON (index >= func->num_templates))return -EINVAL ; command =readl (syscfg->base +SYS_CFGCTRL );
drivers/mtd/mtdpart.c +4 -0
@@ -470,6 +470,10 @@ static struct mtd_part *allocate_partition(struct mtd_info *parent,/* let's register it anyway to preserve ordering */ slave->offset =0 ; slave->mtd.size =0 ; + +/* Initialize ->erasesize to make add_mtd_device() happy. */ + slave->mtd.erasesize = parent->erasesize; +printk (KERN_ERR "mtd: partition \"%s\" is out of reach -- disabled\n" , part->name); goto out_register;
drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c +6 -7
@@ -155,9 +155,10 @@ int gpmi_init(struct gpmi_nand_data *this)/* * Reset BCH here, too. We got failures otherwise :( -* See later BCH reset for explanation of MX23 handling +* See later BCH reset for explanation of MX23 and MX28 handling */ - ret =gpmi_reset_block (r->bch_regs,GPMI_IS_MX23 (this)); + ret =gpmi_reset_block (r->bch_regs, +GPMI_IS_MX23 (this) ||GPMI_IS_MX28 (this));if (ret) goto err_out;
@@ -263,12 +264,10 @@ int bch_set_geometry(struct gpmi_nand_data *this)/* * Due to erratum #2847 of the MX23, the BCH cannot be soft reset on this * chip, otherwise it will lock up. So we skip resetting BCH on the MX23. -* On the other hand, the MX28 needs the reset, because one case has been -* seen where the BCH produced ECC errors constantly after 10000 -* consecutive reboots. The latter case has not been seen on the MX23 -* yet, still we don't know if it could happen there as well. +* and MX28. */ - ret =gpmi_reset_block (r->bch_regs,GPMI_IS_MX23 (this)); + ret =gpmi_reset_block (r->bch_regs, +GPMI_IS_MX23 (this) ||GPMI_IS_MX28 (this));if (ret) goto err_out;
drivers/mtd/nand/spi/core.c +22 -24
79 lines not on this page · raw message
drivers/pinctrl/intel/pinctrl-cherryview.c +4 -4
@@ -1524,7 +1524,7 @@ static const struct dmi_system_id chv_no_valid_mask[] = { .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"GOOGLE" ),DMI_MATCH (DMI_PRODUCT_FAMILY ,"Intel_Strago" ), - DMI_MATCH(DMI_BOARD_VERSION, "1.0"), + DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"), }, }, {
@@ -1532,7 +1532,7 @@ static const struct dmi_system_id chv_no_valid_mask[] = { .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"HP" ),DMI_MATCH (DMI_PRODUCT_NAME ,"Setzer" ), - DMI_MATCH(DMI_BOARD_VERSION, "1.0"), + DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"), }, }, {
@@ -1540,7 +1540,7 @@ static const struct dmi_system_id chv_no_valid_mask[] = { .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"GOOGLE" ),DMI_MATCH (DMI_PRODUCT_NAME ,"Cyan" ), - DMI_MATCH(DMI_BOARD_VERSION, "1.0"), + DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"), }, }, {
@@ -1548,7 +1548,7 @@ static const struct dmi_system_id chv_no_valid_mask[] = { .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"GOOGLE" ),DMI_MATCH (DMI_PRODUCT_NAME ,"Celes" ), - DMI_MATCH(DMI_BOARD_VERSION, "1.0"), + DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"), }, }, {}
drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c +1 -1
@@ -588,7 +588,7 @@ static const unsigned int h6_irq_bank_map[] = { 1, 5, 6, 7 };static const struct sunxi_pinctrl_desc h6_pinctrl_data = { .pins = h6_pins, .npins =ARRAY_SIZE (h6_pins), - .irq_banks =3 , + .irq_banks =4 , .irq_bank_map = h6_irq_bank_map, .irq_read_needs_mux = true, };
fs/debugfs/inode.c +7 -0
@@ -787,6 +787,13 @@ struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry,struct dentry *dentry =NULL , *trap;struct name_snapshot old_name; +if (IS_ERR (old_dir)) +return old_dir; +if (IS_ERR (new_dir)) +return new_dir; +if (IS_ERR_OR_NULL (old_dentry)) +return old_dentry; + trap =lock_rename (new_dir, old_dir);/* Source or destination directories don't exist? */ if (d_really_is_negative (old_dir) ||d_really_is_negative (new_dir))
fs/ext4/fsync.c +4 -9
@@ -116,16 +116,8 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) goto out; } - ret =file_write_and_wait_range (file, start, end); -if (ret) -return ret; -if (!journal) { -struct writeback_control wbc = { - .sync_mode =WB_SYNC_ALL - }; - - ret =ext4_write_inode (inode, &wbc); + ret =__generic_file_fsync (file, start, end, datasync);if (!ret) ret =ext4_sync_parent (inode);if (test_opt (inode->i_sb,BARRIER ))
@@ -133,6 +125,9 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) goto out; } + ret =file_write_and_wait_range (file, start, end); +if (ret) +return ret;/* * data=writeback,ordered: * The caller's filemap_fdatawrite()/wait will sync the data.
include/linux/sunrpc/xprt.h +5 -0
@@ -443,6 +443,11 @@ static inline int xprt_test_and_set_connecting(struct rpc_xprt *xprt)return test_and_set_bit (XPRT_CONNECTING , &xprt->state); } +static inline int xprt_close_wait (struct rpc_xprt *xprt) +{ +return test_bit (XPRT_CLOSE_WAIT , &xprt->state); +} +static inline void xprt_set_bound (struct rpc_xprt *xprt) {test_and_set_bit (XPRT_BOUND , &xprt->state);
kernel/signal.c +57 -1
82 lines not on this page · raw message
kernel/trace/trace_uprobe.c +1 -1
@@ -5,7 +5,7 @@* Copyright (C) IBM Corporation, 2010-2012 * Author: Srikar Dronamraju <[email protected]> */ -#define pr_fmt (fmt) "trace_kprobe: " fmt +#define pr_fmt (fmt) "trace_uprobe: " fmt#include <linux/module.h> #include <linux/uaccess.h>
net/batman-adv/hard-interface.c +3 -2
@@ -20,7 +20,6 @@#include "main.h" #include <linux/atomic.h> -#include <linux/bug.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/gfp.h>
@@ -179,8 +178,10 @@ static bool batadv_is_on_batman_iface(const struct net_device *net_dev) parent_dev =__dev_get_by_index ((struct net *)parent_net,dev_get_iflink (net_dev));/* if we got a NULL parent_dev there is something broken.. */ -if (WARN (!parent_dev,"Cannot find parent device" )) +if (!parent_dev) { +pr_err ("Cannot find parent device\n" );return false; + }if (batadv_mutual_parents (net_dev, net, parent_dev, parent_net))return false;
net/batman-adv/soft-interface.c +2 -0
@@ -221,6 +221,8 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb,netif_trans_update (soft_iface); vid =batadv_get_vid (skb,0 ); + +skb_reset_mac_header (skb); ethhdr =eth_hdr (skb);switch (ntohs (ethhdr->h_proto)) {
net/ceph/messenger.c +3 -2
@@ -3240,9 +3240,10 @@ void ceph_con_keepalive(struct ceph_connection *con)dout ("con_keepalive %p\n" , con);mutex_lock (&con->mutex);clear_standby (con); +con_flag_set (con,CON_FLAG_KEEPALIVE_PENDING );mutex_unlock (&con->mutex); -if (con_flag_test_and_set (con,CON_FLAG_KEEPALIVE_PENDING ) ==0 && -con_flag_test_and_set (con,CON_FLAG_WRITE_PENDING ) ==0 ) + +if (con_flag_test_and_set (con,CON_FLAG_WRITE_PENDING ) ==0 )queue_con (con); }EXPORT_SYMBOL (ceph_con_keepalive);
net/mac80211/tx.c +9 -3
@@ -1913,9 +1913,16 @@ static int ieee80211_skb_resize(struct ieee80211_sub_if_data *sdata, int head_need, bool may_encrypt) {struct ieee80211_local *local = sdata->local; +struct ieee80211_hdr *hdr; +bool enc_tailroom;int tail_need =0 ; -if (may_encrypt && sdata->crypto_tx_tailroom_needed_cnt) { + hdr = (struct ieee80211_hdr *) skb->data; + enc_tailroom = may_encrypt && + (sdata->crypto_tx_tailroom_needed_cnt || +ieee80211_is_mgmt (hdr->frame_control)); + +if (enc_tailroom) { tail_need =IEEE80211_ENCRYPT_TAILROOM ; tail_need -=skb_tailroom (skb); tail_need =max_t (int, tail_need,0 );
@@ -1923,8 +1930,7 @@ static int ieee80211_skb_resize(struct ieee80211_sub_if_data *sdata,if (skb_cloned (skb) && (!ieee80211_hw_check (&local->hw,SUPPORTS_CLONED_SKBS ) || - !skb_clone_writable (skb,ETH_HLEN ) || - (may_encrypt && sdata->crypto_tx_tailroom_needed_cnt))) + !skb_clone_writable (skb,ETH_HLEN ) || enc_tailroom))I802_DEBUG_INC (local->tx_expand_skb_head_cloned);else if (head_need || tail_need)I802_DEBUG_INC (local->tx_expand_skb_head);
net/sunrpc/clnt.c +4 -2
@@ -1992,13 +1992,15 @@ call_transmit(struct rpc_task *task)static void call_transmit_status (struct rpc_task *task) { +struct rpc_xprt *xprt = task->tk_rqstp->rq_xprt; task->tk_action = call_status;/* * Common case: success. Force the compiler to put this -* test first. +* test first. Or, if any error and xprt_close_wait, +* release the xprt lock so the socket can close. */ -if (task->tk_status ==0 ) { +if (task->tk_status ==0 ||xprt_close_wait (xprt)) {xprt_end_transmit (task);rpc_task_force_reencode (task);return ;
net/sunrpc/xprtrdma/svc_rdma_sendto.c +99 -6
129 lines not on this page · raw message
net/sunrpc/xprtrdma/svc_rdma_transport.c +6 -7
@@ -475,13 +475,12 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)/* Qualify the transport resource defaults with the * capabilities of this particular device */ - newxprt->sc_max_send_sges = dev->attrs.max_send_sge; -/* transport hdr, head iovec, one page list entry, tail iovec */ -if (newxprt->sc_max_send_sges <4 ) { -pr_err ("svcrdma: too few Send SGEs available (%d)\n" , - newxprt->sc_max_send_sges); - goto errout; - } +/* Transport header, head iovec, tail iovec */ + newxprt->sc_max_send_sges =3 ; +/* Add one SGE per page list entry */ + newxprt->sc_max_send_sges += (svcrdma_max_req_size /PAGE_SIZE ) +1 ; +if (newxprt->sc_max_send_sges > dev->attrs.max_send_sge) + newxprt->sc_max_send_sges = dev->attrs.max_send_sge; newxprt->sc_max_req_size = svcrdma_max_req_size; newxprt->sc_max_requests = svcrdma_max_requests; newxprt->sc_max_bc_requests = svcrdma_max_bc_requests;
net/xfrm/xfrm_policy.c +4 -1
@@ -1628,7 +1628,10 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy,dst_copy_metrics (dst1, dst);if (xfrm[i]->props.mode !=XFRM_MODE_TRANSPORT ) { -__u32 mark =xfrm_smark_get (fl->flowi_mark, xfrm[i]); +__u32 mark =0 ; + +if (xfrm[i]->props.smark.v || xfrm[i]->props.smark.m) + mark =xfrm_smark_get (fl->flowi_mark, xfrm[i]); family = xfrm[i]->props.family; dst = xfrm_dst_lookup(xfrm[i], tos, fl->flowi_oif,
net/xfrm/xfrm_user.c +9 -4
@@ -1488,10 +1488,15 @@ static int validate_tmpl(int nr, struct xfrm_user_tmpl *ut, u16 family)if (!ut[i].family) ut[i].family = family; -if ((ut[i].mode ==XFRM_MODE_TRANSPORT ) && - (ut[i].family != prev_family)) -return -EINVAL ; - +switch (ut[i].mode) { +case XFRM_MODE_TUNNEL : +case XFRM_MODE_BEET : +break ; +default : +if (ut[i].family != prev_family) +return -EINVAL ; +break ; + }if (ut[i].mode >=XFRM_MODE_MAX )return -EINVAL ;
samples/mei/mei-amt-version.c +1 -1
@@ -117,7 +117,7 @@ static bool mei_init(struct mei *me, const uuid_le *guid, me->verbose = verbose; - me->fd =open ("/dev/mei" ,O_RDWR ); + me->fd =open ("/dev/mei0" ,O_RDWR );if (me->fd ==-1 ) {mei_err (me,"Cannot establish a handle to the Intel MEI driver\n" ); goto err;
tools/iio/iio_generic_buffer.c +1 -1
@@ -330,7 +330,7 @@ static const struct option longopts[] = {int main (int argc,char **argv) { -unsigned long long num_loops =2 ; +long long num_loops =2 ;unsigned long timedelay =1000000 ;unsigned long buf_len =128 ;