Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android (fffb1d2b) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/devicetree/bindings/spi/spi_pl022.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,9 +4,9 @@ Required properties:
		- compatible : "arm,pl022", "arm,primecell"
		- reg : Offset and length of the register set for the device
		- interrupts : Should contain SPI controller interrupt
		- num-cs : total number of chipselects

		Optional properties:
		- num-cs : total number of chipselects
		- cs-gpios : should specify GPIOs used for chipselects.
		The gpios will be referred to as reg = <index> in the SPI child nodes.
		If unspecified, a single SPI device without a chip select can be used.

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 18
		SUBLEVEL = 19
		SUBLEVEL = 20
		EXTRAVERSION =
		NAME = Shuffling Zombie Juror

arch/arm64/mm/hugetlbpage.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -40,13 +40,13 @@ int huge_pmd_unshare(struct mm_struct mm, unsigned long addr, pte_t *ptep)

		int pmd_huge(pmd_t pmd)
		{
		return !(pmd_val(pmd) & PMD_TABLE_BIT);
		return pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT);
		}

		int pud_huge(pud_t pud)
		{
		#ifndef __PAGETABLE_PMD_FOLDED
		return !(pud_val(pud) & PUD_TABLE_BIT);
		return pud_val(pud) && !(pud_val(pud) & PUD_TABLE_BIT);
		#else
		return 0;
		#endif

block/blk-mq.c

+13 −21

Original line number	Diff line number	Diff line
		@@ -1473,22 +1473,6 @@ static int blk_mq_hctx_cpu_offline(struct blk_mq_hw_ctx *hctx, int cpu)
		return NOTIFY_OK;
		}

		static int blk_mq_hctx_cpu_online(struct blk_mq_hw_ctx *hctx, int cpu)
		{
		struct request_queue *q = hctx->queue;
		struct blk_mq_tag_set *set = q->tag_set;

		if (set->tags[hctx->queue_num])
		return NOTIFY_OK;

		set->tags[hctx->queue_num] = blk_mq_init_rq_map(set, hctx->queue_num);
		if (!set->tags[hctx->queue_num])
		return NOTIFY_STOP;

		hctx->tags = set->tags[hctx->queue_num];
		return NOTIFY_OK;
		}

		static int blk_mq_hctx_notify(void *data, unsigned long action,
		unsigned int cpu)
		{
		@@ -1496,8 +1480,11 @@ static int blk_mq_hctx_notify(void *data, unsigned long action,

		if (action == CPU_DEAD \|\| action == CPU_DEAD_FROZEN)
		return blk_mq_hctx_cpu_offline(hctx, cpu);
		else if (action == CPU_ONLINE \|\| action == CPU_ONLINE_FROZEN)
		return blk_mq_hctx_cpu_online(hctx, cpu);

		/*
		* In case of CPU online, tags may be reallocated
		* in blk_mq_map_swqueue() after mapping is updated.
		*/

		return NOTIFY_OK;
		}
		@@ -1682,6 +1669,7 @@ static void blk_mq_map_swqueue(struct request_queue *q)
		unsigned int i;
		struct blk_mq_hw_ctx *hctx;
		struct blk_mq_ctx *ctx;
		struct blk_mq_tag_set *set = q->tag_set;

		queue_for_each_hw_ctx(q, hctx, i) {
		cpumask_clear(hctx->cpumask);
		@@ -1708,16 +1696,20 @@ static void blk_mq_map_swqueue(struct request_queue *q)
		* disable it and free the request entries.
		*/
		if (!hctx->nr_ctx) {
		struct blk_mq_tag_set *set = q->tag_set;

		if (set->tags[i]) {
		blk_mq_free_rq_map(set, set->tags[i], i);
		set->tags[i] = NULL;
		hctx->tags = NULL;
		}
		hctx->tags = NULL;
		continue;
		}

		/* unmapped hw queue can be remapped after CPU topo changed */
		if (!set->tags[i])
		set->tags[i] = blk_mq_init_rq_map(set, i);
		hctx->tags = set->tags[i];
		WARN_ON(!hctx->tags);

		/*
		* Initialize batch roundrobin counts
		*/

drivers/acpi/acpica/utxfinit.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -175,11 +175,13 @@ acpi_status __init acpi_enable_subsystem(u32 flags)
		* Obtain a permanent mapping for the FACS. This is required for the
		* Global Lock and the Firmware Waking Vector
		*/
		if (!(flags & ACPI_NO_FACS_INIT)) {
		status = acpi_tb_initialize_facs();
		if (ACPI_FAILURE(status)) {
		ACPI_WARNING((AE_INFO, "Could not map the FACS table"));
		return_ACPI_STATUS(status);
		}
		}
		#endif /* !ACPI_REDUCED_HARDWARE */

		/*