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

Commit 65876b44 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch '4.9/tmp-598195a9' into msm-4.9"

parents 7dfaddba f61a52a4

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 36

SUBLEVEL = 37

EXTRAVERSION =

NAME = Roaring Lionus

arch/x86/lib/copy_user_64.S

+5 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ ENTRY(copy_user_generic_unrolled) 
	movl %edx,%ecx

	andl $63,%edx

	shrl $6,%ecx

	jz 17f

	jz .L_copy_short_string

1:	movq (%rsi),%r8

2:	movq 1*8(%rsi),%r9

3:	movq 2*8(%rsi),%r10
@@ -105,7 +105,8 @@ ENTRY(copy_user_generic_unrolled) 
	leaq 64(%rdi),%rdi

	decl %ecx

	jnz 1b

17:	movl %edx,%ecx

.L_copy_short_string:

	movl %edx,%ecx

	andl $7,%edx

	shrl $3,%ecx

	jz 20f
@@ -221,6 +222,8 @@ EXPORT_SYMBOL(copy_user_generic_string) 
 */

ENTRY(copy_user_enhanced_fast_string)

	ASM_STAC

	cmpl $64,%edx

	jb .L_copy_short_string	/* less then 64 bytes, avoid the costly 'rep' */

	movl %edx,%ecx

1:	rep

	movsb

arch/x86/tools/relocs.c

+2 −1
Original line number Diff line number Diff line
@@ -992,11 +992,12 @@ static void emit_relocs(int as_text, int use_real_mode) 
		die("Segment relocations found but --realmode not specified\n");



	/* Order the relocations for more efficient processing */

	sort_relocs(&relocs16);

	sort_relocs(&relocs32);

#if ELF_BITS == 64

	sort_relocs(&relocs32neg);

	sort_relocs(&relocs64);

#else

	sort_relocs(&relocs16);

#endif



	/* Print the relocations */

crypto/drbg.c

+1 −0
Original line number Diff line number Diff line
@@ -1691,6 +1691,7 @@ static int drbg_init_sym_kernel(struct drbg_state *drbg) 
		return PTR_ERR(sk_tfm);

	}

	drbg->ctr_handle = sk_tfm;

	init_completion(&drbg->ctr_completion);



	req = skcipher_request_alloc(sk_tfm, GFP_KERNEL);

	if (!req) {

drivers/base/platform.c

+9 −2
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ static ssize_t driver_override_store(struct device *dev, 
				     const char *buf, size_t count)

{

	struct platform_device *pdev = to_platform_device(dev);

	char *driver_override, *old = pdev->driver_override, *cp;

	char *driver_override, *old, *cp;



	if (count > PATH_MAX)

		return -EINVAL;
@@ -869,12 +869,15 @@ static ssize_t driver_override_store(struct device *dev, 
	if (cp)

		*cp = '\0';



	device_lock(dev);

	old = pdev->driver_override;

	if (strlen(driver_override)) {

		pdev->driver_override = driver_override;

	} else {

		kfree(driver_override);

		pdev->driver_override = NULL;

	}

	device_unlock(dev);



	kfree(old);
@@ -885,8 +888,12 @@ static ssize_t driver_override_show(struct device *dev, 
				    struct device_attribute *attr, char *buf)

{

	struct platform_device *pdev = to_platform_device(dev);

	ssize_t len;



	return sprintf(buf, "%s\n", pdev->driver_override);

	device_lock(dev);

	len = sprintf(buf, "%s\n", pdev->driver_override);

	device_unlock(dev);

	return len;

}

static DEVICE_ATTR_RW(driver_override);