Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27c2ecdf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.14.327 into android-4.14-stable 



Changes in 4.14.327
	NFS/pNFS: Report EINVAL errors from connect() to the server
	ipv4: fix null-deref in ipv4_link_failure
	powerpc/perf/hv-24x7: Update domain value check
	dccp: fix dccp_v4_err()/dccp_v6_err() again
	team: fix null-ptr-deref when team device type is changed
	gpio: tb10x: Fix an error handling path in tb10x_gpio_probe()
	i2c: mux: demux-pinctrl: check the return value of devm_kstrdup()
	clk: tegra: fix error return case for recalc_rate
	xtensa: boot: don't add include-dirs
	xtensa: boot/lib: fix function prototypes
	parisc: sba: Fix compile warning wrt list of SBA devices
	parisc: iosapic.c: Fix sparse warnings
	parisc: irq: Make irq_stack_union static to avoid sparse warning
	selftests/ftrace: Correctly enable event in instance-event.tc
	ring-buffer: Avoid softlockup in ring_buffer_resize()
	ata: libata-eh: do not clear ATA_PFLAG_EH_PENDING in ata_eh_reset()
	fbdev/sh7760fb: Depend on FB=y
	ata: ahci: Drop pointless VPRINTK() calls and convert the remaining ones
	ata: libahci: clear pending interrupt status
	watchdog: iTCO_wdt: No need to stop the timer in probe
	watchdog: iTCO_wdt: Set NO_REBOOT if the watchdog is not already running
	serial: 8250_port: Check IRQ data before use
	nilfs2: fix potential use after free in nilfs_gccache_submit_read_data()
	ata: libata-scsi: ignore reserved bits for REPORT SUPPORTED OPERATION CODES
	i2c: i801: unregister tco_pdev in i801_probe() error path
	btrfs: properly report 0 avail for very full file systems
	ata: libata-core: Fix ata_port_request_pm() locking
	ata: libata-core: Fix port and device removal
	ata: libata-sata: increase PMP SRST timeout to 10s
	fs: binfmt_elf_efpic: fix personality for ELF-FDPIC
	vc_screen: reload load of struct vc_data pointer in vcs_write() to avoid UAF
	ext4: fix rec_len verify error
	net/sched: sch_hfsc: Ensure inner classes have fsc curve
	ata: libata: disallow dev-initiated LPM transitions to unsupported states
	media: dvb: symbol fixup for dvb_attach() - again
	scsi: zfcp: Fix a double put in zfcp_port_enqueue()
	wifi: mwifiex: Fix tlv_buf_left calculation
	ubi: Refuse attaching if mtd's erasesize is 0
	wifi: mwifiex: Fix oob check condition in mwifiex_process_rx_packet
	drivers/net: process the result of hdlc_open() and add call of hdlc_close() in uhdlc_close()
	regmap: rbtree: Fix wrong register marked as in-cache when creating new node
	scsi: target: core: Fix deadlock due to recursive locking
	modpost: add missing else to the "of" check
	ipv4, ipv6: Fix handling of transhdrlen in __ip{,6}_append_data()
	net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg
	tcp: fix delayed ACKs for MSS boundary condition
	sctp: update transport state when processing a dupcook packet
	sctp: update hb timer immediately after users change hb_interval
	cpupower: add Makefile dependencies for install targets
	IB/mlx4: Fix the size of a buffer in add_port_entries()
	gpio: aspeed: fix the GPIO number passed to pinctrl_gpio_set_config()
	RDMA/cma: Fix truncation compilation warning in make_cma_ports
	RDMA/mlx5: Fix NULL string error
	parisc: Restore __ldcw_align for PA-RISC 2.0 processors
	Revert "rtnetlink: Reject negative ifindexes in RTM_NEWLINK"
	rtnetlink: Reject negative ifindexes in RTM_NEWLINK
	xen/events: replace evtchn_rwlock with RCU
	Linux 4.14.327

Change-Id: Id05d43bbb2482e858390f6cb31f43ba16c669675
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 3b3807ea 8164d236

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 326

SUBLEVEL = 327

EXTRAVERSION =

NAME = Petit Gorille

arch/parisc/include/asm/ldcw.h

+20 −16
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#ifndef __PARISC_LDCW_H

#define __PARISC_LDCW_H



#ifndef CONFIG_PA20

/* Because kmalloc only guarantees 8-byte alignment for kmalloc'd data,

   and GCC only guarantees 8-byte alignment for stack locals, we can't

   be assured of 16-byte alignment for atomic lock data even if we
@@ -11,6 +10,21 @@ 
   type and dynamically select the 16-byte aligned int from the array

   for the semaphore. */



/* From: "Jim Hull" <jim.hull of hp.com>

   I've attached a summary of the change, but basically, for PA 2.0, as

   long as the ",CO" (coherent operation) completer is implemented, then the

   16-byte alignment requirement for ldcw and ldcd is relaxed, and instead

   they only require "natural" alignment (4-byte for ldcw, 8-byte for

   ldcd).



   Although the cache control hint is accepted by all PA 2.0 processors,

   it is only implemented on PA8800/PA8900 CPUs. Prior PA8X00 CPUs still

   require 16-byte alignment. If the address is unaligned, the operation

   of the instruction is undefined. The ldcw instruction does not generate

   unaligned data reference traps so misaligned accesses are not detected.

   This hid the problem for years. So, restore the 16-byte alignment dropped

   by Kyle McMartin in "Remove __ldcw_align for PA-RISC 2.0 processors". */



#define __PA_LDCW_ALIGNMENT	16

#define __PA_LDCW_ALIGN_ORDER	4

#define __ldcw_align(a) ({					\
@@ -19,22 +33,12 @@ 
		& ~(__PA_LDCW_ALIGNMENT - 1);			\

	(volatile unsigned int *) __ret;			\

})

#define __LDCW	"ldcw"



#else /*CONFIG_PA20*/

/* From: "Jim Hull" <jim.hull of hp.com>

   I've attached a summary of the change, but basically, for PA 2.0, as

   long as the ",CO" (coherent operation) completer is specified, then the

   16-byte alignment requirement for ldcw and ldcd is relaxed, and instead

   they only require "natural" alignment (4-byte for ldcw, 8-byte for

   ldcd). */



#define __PA_LDCW_ALIGNMENT	4

#define __PA_LDCW_ALIGN_ORDER	2

#define __ldcw_align(a) (&(a)->slock)

#ifdef CONFIG_PA20

#define __LDCW	"ldcw,co"



#endif /*!CONFIG_PA20*/

#else

#define __LDCW	"ldcw"

#endif



/* LDCW, the only atomic read-write operation PA-RISC has. *sigh*.

   We don't explicitly expose that "*a" may be written as reload

arch/parisc/include/asm/ropes.h

+3 −0
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ struct sba_device { 
	struct ioc		ioc[MAX_IOC];

};



/* list of SBA's in system, see drivers/parisc/sba_iommu.c */

extern struct sba_device *sba_list;



#define ASTRO_RUNWAY_PORT	0x582

#define IKE_MERCED_PORT		0x803

#define REO_MERCED_PORT		0x804

arch/parisc/include/asm/spinlock_types.h

+0 −5
Original line number Diff line number Diff line
@@ -3,13 +3,8 @@ 
#define __ASM_SPINLOCK_TYPES_H



typedef struct {

#ifdef CONFIG_PA20

	volatile unsigned int slock;

# define __ARCH_SPIN_LOCK_UNLOCKED { 1 }

#else

	volatile unsigned int lock[4];

# define __ARCH_SPIN_LOCK_UNLOCKED	{ { 1, 1, 1, 1 } }

#endif

} arch_spinlock_t;



typedef struct {

arch/parisc/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ union irq_stack_union { 
	volatile unsigned int lock[1];

};



DEFINE_PER_CPU(union irq_stack_union, irq_stack_union) = {

static DEFINE_PER_CPU(union irq_stack_union, irq_stack_union) = {

		.slock = { 1,1,1,1 },

	};

#endif