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

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

Merge 4.9.150 into android-4.9 



Changes in 4.9.150
	pinctrl: meson: fix pull enable register calculation
	powerpc: Fix COFF zImage booting on old powermacs
	ARM: imx: update the cpu power up timing setting on i.mx6sx
	ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
	Input: restore EV_ABS ABS_RESERVED
	checkstack.pl: fix for aarch64
	xfrm: Fix bucket count reported to userspace
	netfilter: seqadj: re-load tcp header pointer after possible head reallocation
	scsi: bnx2fc: Fix NULL dereference in error handling
	Input: omap-keypad - fix idle configuration to not block SoC idle states
	netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel
	bnx2x: Clear fip MAC when fcoe offload support is disabled
	bnx2x: Remove configured vlans as part of unload sequence.
	bnx2x: Send update-svid ramrod with retry/poll flags enabled
	scsi: target: iscsi: cxgbit: fix csk leak
	scsi: target: iscsi: cxgbit: add missing spin_lock_init()
	drivers: net: xgene: Remove unnecessary forward declarations
	w90p910_ether: remove incorrect __init annotation
	net: hns: Incorrect offset address used for some registers.
	net: hns: All ports can not work when insmod hns ko after rmmod.
	net: hns: Some registers use wrong address according to the datasheet.
	net: hns: Fixed bug that netdev was opened twice
	net: hns: Clean rx fbd when ae stopped.
	net: hns: Free irq when exit from abnormal branch
	net: hns: Avoid net reset caused by pause frames storm
	net: hns: Fix ntuple-filters status error.
	net: hns: Add mac pcs config when enable|disable mac
	SUNRPC: Fix a race with XPRT_CONNECTING
	lan78xx: Resolve issue with changing MAC address
	vxge: ensure data0 is initialized in when fetching firmware version information
	net: netxen: fix a missing check and an uninitialized use
	serial/sunsu: fix refcount leak
	scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown
	libceph: fix CEPH_FEATURE_CEPHX_V2 check in calc_signature()
	fork: record start_time late
	hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined
	mm, devm_memremap_pages: mark devm_memremap_pages() EXPORT_SYMBOL_GPL
	mm, devm_memremap_pages: kill mapping "System RAM" support
	sunrpc: fix cache_head leak due to queued request
	sunrpc: use SVC_NET() in svcauth_gss_* functions
	MIPS: math-emu: Write-protect delay slot emulation pages
	crypto: x86/chacha20 - avoid sleeping with preemption disabled
	vhost/vsock: fix uninitialized vhost_vsock->guest_cid
	IB/hfi1: Incorrect sizing of sge for PIO will OOPs
	ALSA: cs46xx: Potential NULL dereference in probe
	ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit()
	ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks
	dlm: fixed memory leaks after failed ls_remove_names allocation
	dlm: possible memory leak on error path in create_lkb()
	dlm: lost put_lkb on error path in receive_convert() and receive_unlock()
	dlm: memory leaks on error path in dlm_user_request()
	gfs2: Get rid of potential double-freeing in gfs2_create_inode
	gfs2: Fix loop in gfs2_rbm_find
	b43: Fix error in cordic routine
	powerpc/tm: Set MSR[TS] just prior to recheckpoint
	9p/net: put a lower bound on msize
	rxe: fix error completion wr_id and qp_num
	iommu/vt-d: Handle domain agaw being less than iommu agaw
	ceph: don't update importing cap's mseq when handing cap export
	genwqe: Fix size check
	intel_th: msu: Fix an off-by-one in attribute store
	power: supply: olpc_battery: correct the temperature units
	drm/vc4: Set ->is_yuv to false when num_planes == 1
	bnx2x: Fix NULL pointer dereference in bnx2x_del_all_vlans() on some hw
	Linux 4.9.150

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 9e6c14f4 df606268

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 149

SUBLEVEL = 150

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/imx7d-nitrogen7.dts

+7 −2
Original line number Diff line number Diff line
@@ -117,13 +117,17 @@ 
		compatible = "regulator-fixed";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;

		clock-names = "slow";

		regulator-name = "reg_wlan";

		startup-delay-us = <70000>;

		gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	usdhc2_pwrseq: usdhc2_pwrseq {

		compatible = "mmc-pwrseq-simple";

		clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;

		clock-names = "ext_clock";

	};

};



&adc1 {
@@ -430,6 +434,7 @@ 
	bus-width = <4>;

	non-removable;

	vmmc-supply = <&reg_wlan>;

	mmc-pwrseq = <&usdhc2_pwrseq>;

	cap-power-off-card;

	keep-power-in-suspend;

	status = "okay";

arch/arm/mach-imx/cpuidle-imx6sx.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ int __init imx6sx_cpuidle_init(void) 
	 * except for power up sw2iso which need to be

	 * larger than LDO ramp up time.

	 */

	imx_gpc_set_arm_power_up_timing(2, 1);

	imx_gpc_set_arm_power_up_timing(0xf, 1);

	imx_gpc_set_arm_power_down_timing(1, 1);



	return cpuidle_register(&imx6sx_cpuidle_driver, NULL);

arch/mips/kernel/vdso.c

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) 


	/* Map delay slot emulation page */

	base = mmap_region(NULL, STACK_TOP, PAGE_SIZE,

			   VM_READ|VM_WRITE|VM_EXEC|

			   VM_READ | VM_EXEC |

			   VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,

			   0);

	if (IS_ERR_VALUE(base)) {

arch/mips/math-emu/dsemul.c

+20 −18
Original line number Diff line number Diff line
@@ -211,8 +211,9 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, 
{

	int isa16 = get_isa16_mode(regs->cp0_epc);

	mips_instruction break_math;

	struct emuframe __user *fr;

	int err, fr_idx;

	unsigned long fr_uaddr;

	struct emuframe fr;

	int fr_idx, ret;



	/* NOP is easy */

	if (ir == 0)
@@ -247,27 +248,31 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, 
		fr_idx = alloc_emuframe();

	if (fr_idx == BD_EMUFRAME_NONE)

		return SIGBUS;

	fr = &dsemul_page()[fr_idx];



	/* Retrieve the appropriately encoded break instruction */

	break_math = BREAK_MATH(isa16);



	/* Write the instructions to the frame */

	if (isa16) {

		err = __put_user(ir >> 16,

				 (u16 __user *)(&fr->emul));

		err |= __put_user(ir & 0xffff,

				  (u16 __user *)((long)(&fr->emul) + 2));

		err |= __put_user(break_math >> 16,

				  (u16 __user *)(&fr->badinst));

		err |= __put_user(break_math & 0xffff,

				  (u16 __user *)((long)(&fr->badinst) + 2));

		union mips_instruction _emul = {

			.halfword = { ir >> 16, ir }

		};

		union mips_instruction _badinst = {

			.halfword = { break_math >> 16, break_math }

		};



		fr.emul = _emul.word;

		fr.badinst = _badinst.word;

	} else {

		err = __put_user(ir, &fr->emul);

		err |= __put_user(break_math, &fr->badinst);

		fr.emul = ir;

		fr.badinst = break_math;

	}



	if (unlikely(err)) {

	/* Write the frame to user memory */

	fr_uaddr = (unsigned long)&dsemul_page()[fr_idx];

	ret = access_process_vm(current, fr_uaddr, &fr, sizeof(fr),

				FOLL_FORCE | FOLL_WRITE);

	if (unlikely(ret != sizeof(fr))) {

		MIPS_FPU_EMU_INC_STATS(errors);

		free_emuframe(fr_idx, current->mm);

		return SIGBUS;
@@ -279,10 +284,7 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, 
	atomic_set(&current->thread.bd_emu_frame, fr_idx);



	/* Change user register context to execute the frame */

	regs->cp0_epc = (unsigned long)&fr->emul | isa16;



	/* Ensure the icache observes our newly written frame */

	flush_cache_sigtramp((unsigned long)&fr->emul);

	regs->cp0_epc = fr_uaddr | isa16;



	return 0;

}