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

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

Merge 4.9.193 into android-4.9 



Changes in 4.9.193
	ALSA: hda - Fix potential endless loop at applying quirks
	ALSA: hda/realtek - Fix overridden device-specific initialization
	sched/fair: Don't assign runtime for throttled cfs_rq
	drm/vmwgfx: Fix double free in vmw_recv_msg()
	powerpc/tm: Fix FP/VMX unavailable exceptions inside a transaction
	xfrm: clean up xfrm protocol checks
	ip6: fix skb leak in ip6frag_expire_frag_queue()
	vhost/test: fix build for vhost test
	batman-adv: fix uninit-value in batadv_netlink_get_ifindex()
	batman-adv: Only read OGM tvlv_len after buffer len check
	scripts/decode_stacktrace: match basepath using shell prefix operator, not regex
	clk: s2mps11: Add used attribute to s2mps11_dt_match
	vhost: make sure log_num < in_num
	Linux 4.9.193

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents bb1c7f3a 779cde69

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 192

SUBLEVEL = 193

EXTRAVERSION =

NAME = Roaring Lionus

arch/powerpc/kernel/process.c

+2 −1
Original line number Diff line number Diff line
@@ -476,13 +476,14 @@ void giveup_all(struct task_struct *tsk) 
	if (!tsk->thread.regs)

		return;



	check_if_tm_restore_required(tsk);



	usermsr = tsk->thread.regs->msr;



	if ((usermsr & msr_all_available) == 0)

		return;



	msr_check_and_set(msr_all_available);

	check_if_tm_restore_required(tsk);



#ifdef CONFIG_PPC_FPU

	if (usermsr & MSR_FP)

drivers/clk/clk-s2mps11.c

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ MODULE_DEVICE_TABLE(platform, s2mps11_clk_id); 
 * This requires of_device_id table.  In the same time this will not change the

 * actual *device* matching so do not add .of_match_table.

 */

static const struct of_device_id s2mps11_dt_match[] = {

static const struct of_device_id s2mps11_dt_match[] __used = {

	{

		.compatible = "samsung,s2mps11-clk",

		.data = (void *)S2MPS11X,

drivers/gpu/drm/vmwgfx/vmwgfx_msg.c

+3 −5
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg, 


		if ((HIGH_WORD(ebx) & MESSAGE_STATUS_SUCCESS) == 0) {

			kfree(reply);



			reply = NULL;

			if ((HIGH_WORD(ebx) & MESSAGE_STATUS_CPT) != 0) {

				/* A checkpoint occurred. Retry. */

				continue;
@@ -288,7 +288,7 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg, 


		if ((HIGH_WORD(ecx) & MESSAGE_STATUS_SUCCESS) == 0) {

			kfree(reply);



			reply = NULL;

			if ((HIGH_WORD(ecx) & MESSAGE_STATUS_CPT) != 0) {

				/* A checkpoint occurred. Retry. */

				continue;
@@ -300,10 +300,8 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg, 
		break;

	}



	if (retries == RETRIES) {

		kfree(reply);

	if (!reply)

		return -EINVAL;

	}



	*msg_len = reply_len;

	*msg     = reply;

drivers/vhost/test.c

+9 −4
Original line number Diff line number Diff line
@@ -23,6 +23,12 @@ 
 * Using this limit prevents one virtqueue from starving others. */

#define VHOST_TEST_WEIGHT 0x80000



/* Max number of packets transferred before requeueing the job.

 * Using this limit prevents one virtqueue from starving others with

 * pkts.

 */

#define VHOST_TEST_PKT_WEIGHT 256



enum {

	VHOST_TEST_VQ = 0,

	VHOST_TEST_VQ_MAX = 1,
@@ -81,11 +87,9 @@ static void handle_vq(struct vhost_test *n) 
		}

		vhost_add_used_and_signal(&n->dev, vq, head, 0);

		total_len += len;

		if (unlikely(total_len >= VHOST_TEST_WEIGHT)) {

			vhost_poll_queue(&vq->poll);

		if (unlikely(vhost_exceeds_weight(vq, 0, total_len)))

			break;

	}

	}



	mutex_unlock(&vq->mutex);

}
@@ -116,7 +120,8 @@ static int vhost_test_open(struct inode *inode, struct file *f) 
	dev = &n->dev;

	vqs[VHOST_TEST_VQ] = &n->vqs[VHOST_TEST_VQ];

	n->vqs[VHOST_TEST_VQ].handle_kick = handle_vq_kick;

	vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX);

	vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX,

		       VHOST_TEST_PKT_WEIGHT, VHOST_TEST_WEIGHT);



	f->private_data = n;