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

Commit 337ccfce authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next

parents b0e159fe 6b7e95d1

Documentation/DocBook/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ DOCBOOKS := z8530book.xml \ 
	    kernel-api.xml filesystems.xml lsm.xml kgdb.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    80211.xml sh.xml regulator.xml w1.xml \

	    sh.xml regulator.xml w1.xml \

	    writing_musb_glue_layer.xml iio.xml



ifeq ($(DOCBOOKS),)

Documentation/unaligned-memory-access.txt

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ bool ether_addr_equal(const u8 *addr1, const u8 *addr2) 
#else

	const u16 *a = (const u16 *)addr1;

	const u16 *b = (const u16 *)addr2;

	return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) != 0;

	return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) == 0;

#endif

}

Makefile

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

PATCHLEVEL = 10

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Roaring Lionus



# *DOCUMENTATION*

arch/x86/include/asm/bitops.h

+13 −0
Original line number Diff line number Diff line
@@ -139,6 +139,19 @@ static __always_inline void __clear_bit(long nr, volatile unsigned long *addr) 
	asm volatile("btr %1,%0" : ADDR : "Ir" (nr));

}



static __always_inline bool clear_bit_unlock_is_negative_byte(long nr, volatile unsigned long *addr)

{

	bool negative;

	asm volatile(LOCK_PREFIX "andb %2,%1\n\t"

		CC_SET(s)

		: CC_OUT(s) (negative), ADDR

		: "ir" ((char) ~(1 << nr)) : "memory");

	return negative;

}



// Let everybody know we have it

#define clear_bit_unlock_is_negative_byte clear_bit_unlock_is_negative_byte



/*

 * __clear_bit_unlock - Clears a bit in memory

 * @nr: Bit to clear

crypto/testmgr.c

+28 −2
Original line number Diff line number Diff line
@@ -1461,16 +1461,25 @@ static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate, 
	for (i = 0; i < ctcount; i++) {

		unsigned int dlen = COMP_BUF_SIZE;

		int ilen = ctemplate[i].inlen;

		void *input_vec;



		input_vec = kmalloc(ilen, GFP_KERNEL);

		if (!input_vec) {

			ret = -ENOMEM;

			goto out;

		}



		memcpy(input_vec, ctemplate[i].input, ilen);

		memset(output, 0, dlen);

		init_completion(&result.completion);

		sg_init_one(&src, ctemplate[i].input, ilen);

		sg_init_one(&src, input_vec, ilen);

		sg_init_one(&dst, output, dlen);



		req = acomp_request_alloc(tfm);

		if (!req) {

			pr_err("alg: acomp: request alloc failed for %s\n",

			       algo);

			kfree(input_vec);

			ret = -ENOMEM;

			goto out;

		}
@@ -1483,6 +1492,7 @@ static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate, 
		if (ret) {

			pr_err("alg: acomp: compression failed on test %d for %s: ret=%d\n",

			       i + 1, algo, -ret);

			kfree(input_vec);

			acomp_request_free(req);

			goto out;

		}
@@ -1491,6 +1501,7 @@ static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate, 
			pr_err("alg: acomp: Compression test %d failed for %s: output len = %d\n",

			       i + 1, algo, req->dlen);

			ret = -EINVAL;

			kfree(input_vec);

			acomp_request_free(req);

			goto out;

		}
@@ -1500,26 +1511,37 @@ static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate, 
			       i + 1, algo);

			hexdump(output, req->dlen);

			ret = -EINVAL;

			kfree(input_vec);

			acomp_request_free(req);

			goto out;

		}



		kfree(input_vec);

		acomp_request_free(req);

	}



	for (i = 0; i < dtcount; i++) {

		unsigned int dlen = COMP_BUF_SIZE;

		int ilen = dtemplate[i].inlen;

		void *input_vec;



		input_vec = kmalloc(ilen, GFP_KERNEL);

		if (!input_vec) {

			ret = -ENOMEM;

			goto out;

		}



		memcpy(input_vec, dtemplate[i].input, ilen);

		memset(output, 0, dlen);

		init_completion(&result.completion);

		sg_init_one(&src, dtemplate[i].input, ilen);

		sg_init_one(&src, input_vec, ilen);

		sg_init_one(&dst, output, dlen);



		req = acomp_request_alloc(tfm);

		if (!req) {

			pr_err("alg: acomp: request alloc failed for %s\n",

			       algo);

			kfree(input_vec);

			ret = -ENOMEM;

			goto out;

		}
@@ -1532,6 +1554,7 @@ static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate, 
		if (ret) {

			pr_err("alg: acomp: decompression failed on test %d for %s: ret=%d\n",

			       i + 1, algo, -ret);

			kfree(input_vec);

			acomp_request_free(req);

			goto out;

		}
@@ -1540,6 +1563,7 @@ static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate, 
			pr_err("alg: acomp: Decompression test %d failed for %s: output len = %d\n",

			       i + 1, algo, req->dlen);

			ret = -EINVAL;

			kfree(input_vec);

			acomp_request_free(req);

			goto out;

		}
@@ -1549,10 +1573,12 @@ static int test_acomp(struct crypto_acomp *tfm, struct comp_testvec *ctemplate, 
			       i + 1, algo);

			hexdump(output, req->dlen);

			ret = -EINVAL;

			kfree(input_vec);

			acomp_request_free(req);

			goto out;

		}



		kfree(input_vec);

		acomp_request_free(req);

	}