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

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

Merge 4.9.52 into android-4.9 



Changes in 4.9.52
	SUNRPC: Refactor svc_set_num_threads()
	NFSv4: Fix callback server shutdown
	mm: prevent double decrease of nr_reserved_highatomic
	orangefs: Don't clear SGID when inheriting ACLs
	IB/{qib, hfi1}: Avoid flow control testing for RDMA write operation
	drm/sun4i: Implement drm_driver lastclose to restore fbdev console
	IB/addr: Fix setting source address in addr6_resolve()
	tty: improve tty_insert_flip_char() fast path
	tty: improve tty_insert_flip_char() slow path
	tty: fix __tty_insert_flip_char regression
	pinctrl/amd: save pin registers over suspend/resume
	Input: i8042 - add Gigabyte P57 to the keyboard reset table
	MIPS: math-emu: <MAX|MAXA|MIN|MINA>.<D|S>: Fix quiet NaN propagation
	MIPS: math-emu: <MAX|MAXA|MIN|MINA>.<D|S>: Fix cases of both inputs zero
	MIPS: math-emu: <MAX|MIN>.<D|S>: Fix cases of both inputs negative
	MIPS: math-emu: <MAXA|MINA>.<D|S>: Fix cases of input values with opposite signs
	MIPS: math-emu: <MAXA|MINA>.<D|S>: Fix cases of both infinite inputs
	MIPS: math-emu: MINA.<D|S>: Fix some cases of infinity and zero inputs
	MIPS: math-emu: Handle zero accumulator case in MADDF and MSUBF separately
	MIPS: math-emu: <MADDF|MSUBF>.<D|S>: Fix NaN propagation
	MIPS: math-emu: <MADDF|MSUBF>.<D|S>: Fix some cases of infinite inputs
	MIPS: math-emu: <MADDF|MSUBF>.<D|S>: Fix some cases of zero inputs
	MIPS: math-emu: <MADDF|MSUBF>.<D|S>: Clean up "maddf_flags" enumeration
	MIPS: math-emu: <MADDF|MSUBF>.S: Fix accuracy (32-bit case)
	MIPS: math-emu: <MADDF|MSUBF>.D: Fix accuracy (64-bit case)
	crypto: ccp - Fix XTS-AES-128 support on v5 CCPs
	crypto: AF_ALG - remove SGL terminator indicator when chaining
	ext4: fix incorrect quotaoff if the quota feature is enabled
	ext4: fix quota inconsistency during orphan cleanup for read-only mounts
	powerpc: Fix DAR reporting when alignment handler faults
	block: Relax a check in blk_start_queue()
	md/bitmap: disable bitmap_resize for file-backed bitmaps.
	skd: Avoid that module unloading triggers a use-after-free
	skd: Submit requests to firmware before triggering the doorbell
	scsi: zfcp: fix queuecommand for scsi_eh commands when DIX enabled
	scsi: zfcp: add handling for FCP_RESID_OVER to the fcp ingress path
	scsi: zfcp: fix capping of unsuccessful GPN_FT SAN response trace records
	scsi: zfcp: fix passing fsf_req to SCSI trace on TMF to correlate with HBA
	scsi: zfcp: fix missing trace records for early returns in TMF eh handlers
	scsi: zfcp: fix payload with full FCP_RSP IU in SCSI trace records
	scsi: zfcp: trace HBA FSF response by default on dismiss or timedout late response
	scsi: zfcp: trace high part of "new" 64 bit SCSI LUN
	scsi: megaraid_sas: set minimum value of resetwaittime to be 1 secs
	scsi: megaraid_sas: Check valid aen class range to avoid kernel panic
	scsi: megaraid_sas: Return pended IOCTLs with cmd_status MFI_STAT_WRONG_STATE in case adapter is dead
	scsi: storvsc: fix memory leak on ring buffer busy
	scsi: sg: remove 'save_scat_len'
	scsi: sg: use standard lists for sg_requests
	scsi: sg: off by one in sg_ioctl()
	scsi: sg: factor out sg_fill_request_table()
	scsi: sg: fixup infoleak when using SG_GET_REQUEST_TABLE
	scsi: qla2xxx: Correction to vha->vref_count timeout
	scsi: qla2xxx: Fix an integer overflow in sysfs code
	ftrace: Fix selftest goto location on error
	ftrace: Fix memleak when unregistering dynamic ops when tracing disabled
	tracing: Add barrier to trace_printk() buffer nesting modification
	tracing: Apply trace_clock changes to instance max buffer
	ARC: Re-enable MMU upon Machine Check exception
	PCI: shpchp: Enable bridge bus mastering if MSI is enabled
	PCI: pciehp: Report power fault only once until we clear it
	net/netfilter/nf_conntrack_core: Fix net_conntrack_lock()
	s390/mm: fix local TLB flushing vs. detach of an mm address space
	s390/mm: fix race on mm->context.flush_mm
	media: v4l2-compat-ioctl32: Fix timespec conversion
	media: uvcvideo: Prevent heap overflow when accessing mapped controls
	PM / devfreq: Fix memory leak when fail to register device
	bcache: initialize dirty stripes in flash_dev_run()
	bcache: Fix leak of bdev reference
	bcache: do not subtract sectors_to_gc for bypassed IO
	bcache: correct cache_dirty_target in __update_writeback_rate()
	bcache: Correct return value for sysfs attach errors
	bcache: fix for gc and write-back race
	bcache: fix bch_hprint crash and improve output
	Linux 4.9.52

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 47589a56 d59dabdc

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 51

SUBLEVEL = 52

EXTRAVERSION =

NAME = Roaring Lionus

arch/arc/kernel/entry.S

+6 −0
Original line number Diff line number Diff line
@@ -92,6 +92,12 @@ ENTRY(EV_MachineCheck) 
	lr  r0, [efa]

	mov r1, sp



	; hardware auto-disables MMU, re-enable it to allow kernel vaddr

	; access for say stack unwinding of modules for crash dumps

	lr	r3, [ARC_REG_PID]

	or	r3, r3, MMU_ENABLE

	sr	r3, [ARC_REG_PID]



	lsr  	r3, r2, 8

	bmsk 	r3, r3, 7

	brne    r3, ECR_C_MCHK_DUP_TLB, 1f

arch/arc/mm/tlb.c

+0 −3
Original line number Diff line number Diff line
@@ -896,9 +896,6 @@ void do_tlb_overlap_fault(unsigned long cause, unsigned long address, 


	local_irq_save(flags);



	/* re-enable the MMU */

	write_aux_reg(ARC_REG_PID, MMU_ENABLE | read_aux_reg(ARC_REG_PID));



	/* loop thru all sets of TLB */

	for (set = 0; set < mmu->sets; set++) {

arch/mips/math-emu/dp_fmax.c

+63 −21
Original line number Diff line number Diff line
@@ -47,14 +47,26 @@ union ieee754dp ieee754dp_fmax(union ieee754dp x, union ieee754dp y) 
	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):

		return ieee754dp_nanxcpt(x);



	/* numbers are preferred to NaNs */

	/*

	 * Quiet NaN handling

	 */



	/*

	 *    The case of both inputs quiet NaNs

	 */

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):

		return x;



	/*

	 *    The cases of exactly one input quiet NaN (numbers

	 *    are here preferred as returned values to NaNs)

	 */

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_QNAN):

		return x;



	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_ZERO):

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_NORM):

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_DNORM):
@@ -80,9 +92,7 @@ union ieee754dp ieee754dp_fmax(union ieee754dp x, union ieee754dp y) 
		return ys ? x : y;



	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO):

		if (xs == ys)

			return x;

		return ieee754dp_zero(1);

		return ieee754dp_zero(xs & ys);



	case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_DNORM):

		DPDNORMX;
@@ -106,17 +116,33 @@ union ieee754dp ieee754dp_fmax(union ieee754dp x, union ieee754dp y) 
	else if (xs < ys)

		return x;



	/* Compare exponent */

	/* Signs of inputs are equal, let's compare exponents */

	if (xs == 0) {

		/* Inputs are both positive */

		if (xe > ye)

			return x;

		else if (xe < ye)

			return y;

	} else {

		/* Inputs are both negative */

		if (xe > ye)

			return y;

		else if (xe < ye)

			return x;

	}



	/* Compare mantissa */

	/* Signs and exponents of inputs are equal, let's compare mantissas */

	if (xs == 0) {

		/* Inputs are both positive, with equal signs and exponents */

		if (xm <= ym)

			return y;

		return x;

	}

	/* Inputs are both negative, with equal signs and exponents */

	if (xm <= ym)

		return x;

	return y;

}



union ieee754dp ieee754dp_fmaxa(union ieee754dp x, union ieee754dp y)

{
@@ -147,14 +173,26 @@ union ieee754dp ieee754dp_fmaxa(union ieee754dp x, union ieee754dp y) 
	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):

		return ieee754dp_nanxcpt(x);



	/* numbers are preferred to NaNs */

	/*

	 * Quiet NaN handling

	 */



	/*

	 *    The case of both inputs quiet NaNs

	 */

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):

		return x;



	/*

	 *    The cases of exactly one input quiet NaN (numbers

	 *    are here preferred as returned values to NaNs)

	 */

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_QNAN):

		return x;



	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_ZERO):

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_NORM):

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_DNORM):
@@ -164,6 +202,9 @@ union ieee754dp ieee754dp_fmaxa(union ieee754dp x, union ieee754dp y) 
	/*

	 * Infinity and zero handling

	 */

	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF):

		return ieee754dp_inf(xs & ys);



	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_ZERO):

	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_NORM):

	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM):
@@ -171,7 +212,6 @@ union ieee754dp ieee754dp_fmaxa(union ieee754dp x, union ieee754dp y) 
	case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_ZERO):

		return x;



	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_INF):

	case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_INF):

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_INF):
@@ -180,9 +220,7 @@ union ieee754dp ieee754dp_fmaxa(union ieee754dp x, union ieee754dp y) 
		return y;



	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO):

		if (xs == ys)

			return x;

		return ieee754dp_zero(1);

		return ieee754dp_zero(xs & ys);



	case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_DNORM):

		DPDNORMX;
@@ -207,7 +245,11 @@ union ieee754dp ieee754dp_fmaxa(union ieee754dp x, union ieee754dp y) 
		return y;



	/* Compare mantissa */

	if (xm <= ym)

	if (xm < ym)

		return y;

	else if (xm > ym)

		return x;

	else if (xs == 0)

		return x;

	return y;

}

arch/mips/math-emu/dp_fmin.c

+64 −22
Original line number Diff line number Diff line
@@ -47,14 +47,26 @@ union ieee754dp ieee754dp_fmin(union ieee754dp x, union ieee754dp y) 
	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):

		return ieee754dp_nanxcpt(x);



	/* numbers are preferred to NaNs */

	/*

	 * Quiet NaN handling

	 */



	/*

	 *    The case of both inputs quiet NaNs

	 */

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):

		return x;



	/*

	 *    The cases of exactly one input quiet NaN (numbers

	 *    are here preferred as returned values to NaNs)

	 */

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_QNAN):

		return x;



	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_ZERO):

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_NORM):

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_DNORM):
@@ -80,9 +92,7 @@ union ieee754dp ieee754dp_fmin(union ieee754dp x, union ieee754dp y) 
		return ys ? y : x;



	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO):

		if (xs == ys)

			return x;

		return ieee754dp_zero(1);

		return ieee754dp_zero(xs | ys);



	case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_DNORM):

		DPDNORMX;
@@ -106,17 +116,33 @@ union ieee754dp ieee754dp_fmin(union ieee754dp x, union ieee754dp y) 
	else if (xs < ys)

		return y;



	/* Compare exponent */

	/* Signs of inputs are the same, let's compare exponents */

	if (xs == 0) {

		/* Inputs are both positive */

		if (xe > ye)

			return y;

		else if (xe < ye)

			return x;

	} else {

		/* Inputs are both negative */

		if (xe > ye)

			return x;

		else if (xe < ye)

			return y;

	}



	/* Compare mantissa */

	/* Signs and exponents of inputs are equal, let's compare mantissas */

	if (xs == 0) {

		/* Inputs are both positive, with equal signs and exponents */

		if (xm <= ym)

			return x;

		return y;

	}

	/* Inputs are both negative, with equal signs and exponents */

	if (xm <= ym)

		return y;

	return x;

}



union ieee754dp ieee754dp_fmina(union ieee754dp x, union ieee754dp y)

{
@@ -147,14 +173,26 @@ union ieee754dp ieee754dp_fmina(union ieee754dp x, union ieee754dp y) 
	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):

		return ieee754dp_nanxcpt(x);



	/* numbers are preferred to NaNs */

	/*

	 * Quiet NaN handling

	 */



	/*

	 *    The case of both inputs quiet NaNs

	 */

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):

		return x;



	/*

	 *    The cases of exactly one input quiet NaN (numbers

	 *    are here preferred as returned values to NaNs)

	 */

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_QNAN):

		return x;



	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_ZERO):

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_NORM):

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_DNORM):
@@ -164,25 +202,25 @@ union ieee754dp ieee754dp_fmina(union ieee754dp x, union ieee754dp y) 
	/*

	 * Infinity and zero handling

	 */

	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF):

		return ieee754dp_inf(xs | ys);



	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_ZERO):

	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_NORM):

	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_ZERO):

	case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_ZERO):

		return x;

		return y;



	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_INF):

	case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_INF):

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_INF):

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_NORM):

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_DNORM):

		return y;

		return x;



	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO):

		if (xs == ys)

			return x;

		return ieee754dp_zero(1);

		return ieee754dp_zero(xs | ys);



	case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_DNORM):

		DPDNORMX;
@@ -207,7 +245,11 @@ union ieee754dp ieee754dp_fmina(union ieee754dp x, union ieee754dp y) 
		return x;



	/* Compare mantissa */

	if (xm <= ym)

	if (xm < ym)

		return x;

	else if (xm > ym)

		return y;

	else if (xs == 1)

		return x;

	return y;

}