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

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

Merge 4.4.193 into android-4.4 



Changes in 4.4.193
	ALSA: hda - Fix potential endless loop at applying quirks
	ALSA: hda/realtek - Fix overridden device-specific initialization
	xfrm: clean up xfrm protocol checks
	vhost/test: fix build for vhost test
	scripts/decode_stacktrace: match basepath using shell prefix operator, not regex
	clk: s2mps11: Add used attribute to s2mps11_dt_match
	x86, boot: Remove multiple copy of static function sanitize_boot_params()
	af_packet: tone down the Tx-ring unsupported spew.
	vhost: make sure log_num < in_num
	Linux 4.4.193

Change-Id: I184694e569ff2252cf7721d77b57229ca899f634
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 3dcafcc6 e19c5132

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 192

SUBLEVEL = 193

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/x86/boot/compressed/misc.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include "misc.h"

#include "../string.h"

#include <asm/bootparam_utils.h>



/* WARNING!!

 * This code is compiled with -fPIC and it is relocated dynamically

arch/x86/boot/compressed/misc.h

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <asm/page.h>

#include <asm/boot.h>

#include <asm/bootparam.h>

#include <asm/bootparam_utils.h>



#define BOOT_BOOT_H

#include "../ctype.h"

drivers/clk/clk-s2mps11.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,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/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;