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

Commit f8c11676 authored by Dmitry Shmidt's avatar Dmitry Shmidt
Browse files

Merge tag 'v4.4.27' into android-4.4.y 

This is the 4.4.27 stable release
parents 59fc7046 3afd8362

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 26

SUBLEVEL = 27

EXTRAVERSION =

NAME = Blurry Fish Butt

block/cfq-iosched.c

+10 −3
Original line number Diff line number Diff line
@@ -3003,7 +3003,6 @@ static struct request *cfq_check_fifo(struct cfq_queue *cfqq) 
	if (time_before(jiffies, rq->fifo_time))

		rq = NULL;



	cfq_log_cfqq(cfqq->cfqd, cfqq, "fifo=%p", rq);

	return rq;

}
@@ -3377,6 +3376,9 @@ static bool cfq_may_dispatch(struct cfq_data *cfqd, struct cfq_queue *cfqq) 
{

	unsigned int max_dispatch;



	if (cfq_cfqq_must_dispatch(cfqq))

		return true;



	/*

	 * Drain async requests before we start sync IO

	 */
@@ -3468,15 +3470,20 @@ static bool cfq_dispatch_request(struct cfq_data *cfqd, struct cfq_queue *cfqq) 


	BUG_ON(RB_EMPTY_ROOT(&cfqq->sort_list));



	rq = cfq_check_fifo(cfqq);

	if (rq)

		cfq_mark_cfqq_must_dispatch(cfqq);



	if (!cfq_may_dispatch(cfqd, cfqq))

		return false;



	/*

	 * follow expired path, else get first next available

	 */

	rq = cfq_check_fifo(cfqq);

	if (!rq)

		rq = cfqq->next_rq;

	else

		cfq_log_cfqq(cfqq->cfqd, cfqq, "fifo=%p", rq);



	/*

	 * insert request into driver dispatch list
@@ -3944,7 +3951,7 @@ cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq, 
	 * if the new request is sync, but the currently running queue is

	 * not, let the sync request have priority.

	 */

	if (rq_is_sync(rq) && !cfq_cfqq_sync(cfqq))

	if (rq_is_sync(rq) && !cfq_cfqq_sync(cfqq) && !cfq_cfqq_must_dispatch(cfqq))

		return true;



	if (new_cfqq->cfqg != cfqq->cfqg)

crypto/async_tx/async_pq.c

+4 −4
Original line number Diff line number Diff line
@@ -368,8 +368,6 @@ async_syndrome_val(struct page **blocks, unsigned int offset, int disks, 


		dma_set_unmap(tx, unmap);

		async_tx_submit(chan, tx, submit);



		return tx;

	} else {

		struct page *p_src = P(blocks, disks);

		struct page *q_src = Q(blocks, disks);
@@ -424,9 +422,11 @@ async_syndrome_val(struct page **blocks, unsigned int offset, int disks, 
		submit->cb_param = cb_param_orig;

		submit->flags = flags_orig;

		async_tx_sync_epilog(submit);



		return NULL;

		tx = NULL;

	}

	dmaengine_unmap_put(unmap);



	return tx;

}

EXPORT_SYMBOL_GPL(async_syndrome_val);

crypto/ghash-generic.c

+1 −12
Original line number Diff line number Diff line
@@ -14,24 +14,13 @@ 


#include <crypto/algapi.h>

#include <crypto/gf128mul.h>

#include <crypto/ghash.h>

#include <crypto/internal/hash.h>

#include <linux/crypto.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/module.h>



#define GHASH_BLOCK_SIZE	16

#define GHASH_DIGEST_SIZE	16



struct ghash_ctx {

	struct gf128mul_4k *gf128;

};



struct ghash_desc_ctx {

	u8 buffer[GHASH_BLOCK_SIZE];

	u32 bytes;

};



static int ghash_init(struct shash_desc *desc)

{

	struct ghash_desc_ctx *dctx = shash_desc_ctx(desc);

drivers/base/dma-mapping.c

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ void dma_common_free_remap(void *cpu_addr, size_t size, unsigned long vm_flags) 
		return;

	}



	unmap_kernel_range((unsigned long)cpu_addr, size);

	unmap_kernel_range((unsigned long)cpu_addr, PAGE_ALIGN(size));

	vunmap(cpu_addr);

}

#endif