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

Commit 30115b69 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.19-q.76 (8ed9c666) into msm-4.19"

parents 0f7acb0b 6941d035

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 75

SUBLEVEL = 76

EXTRAVERSION =

NAME = "People's Front"

arch/powerpc/include/asm/opal.h

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ int64_t opal_xive_get_vp_info(uint64_t vp, 
int64_t opal_xive_set_vp_info(uint64_t vp,

			      uint64_t flags,

			      uint64_t report_cl_pair);

int64_t opal_xive_allocate_irq(uint32_t chip_id);

int64_t opal_xive_allocate_irq_raw(uint32_t chip_id);

int64_t opal_xive_free_irq(uint32_t girq);

int64_t opal_xive_sync(uint32_t type, uint32_t id);

int64_t opal_xive_dump(uint32_t type, uint32_t id);

arch/powerpc/platforms/powernv/opal-wrappers.S

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ OPAL_CALL(opal_xive_set_queue_info, OPAL_XIVE_SET_QUEUE_INFO); 
OPAL_CALL(opal_xive_donate_page,		OPAL_XIVE_DONATE_PAGE);

OPAL_CALL(opal_xive_alloc_vp_block,		OPAL_XIVE_ALLOCATE_VP_BLOCK);

OPAL_CALL(opal_xive_free_vp_block,		OPAL_XIVE_FREE_VP_BLOCK);

OPAL_CALL(opal_xive_allocate_irq,		OPAL_XIVE_ALLOCATE_IRQ);

OPAL_CALL(opal_xive_allocate_irq_raw,		OPAL_XIVE_ALLOCATE_IRQ);

OPAL_CALL(opal_xive_free_irq,			OPAL_XIVE_FREE_IRQ);

OPAL_CALL(opal_xive_get_vp_info,		OPAL_XIVE_GET_VP_INFO);

OPAL_CALL(opal_xive_set_vp_info,		OPAL_XIVE_SET_VP_INFO);

arch/powerpc/sysdev/xive/native.c

+11 −0
Original line number Diff line number Diff line
@@ -235,6 +235,17 @@ static bool xive_native_match(struct device_node *node) 
	return of_device_is_compatible(node, "ibm,opal-xive-vc");

}



static s64 opal_xive_allocate_irq(u32 chip_id)

{

	s64 irq = opal_xive_allocate_irq_raw(chip_id);



	/*

	 * Old versions of skiboot can incorrectly return 0xffffffff to

	 * indicate no space, fix it up here.

	 */

	return irq == 0xffffffff ? OPAL_RESOURCE : irq;

}



#ifdef CONFIG_SMP

static int xive_native_get_ipi(unsigned int cpu, struct xive_cpu *xc)

{

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1165,7 +1165,7 @@ int blk_init_allocated_queue(struct request_queue *q) 
{

	WARN_ON_ONCE(q->mq_ops);



	q->fq = blk_alloc_flush_queue(q, NUMA_NO_NODE, q->cmd_size);

	q->fq = blk_alloc_flush_queue(q, NUMA_NO_NODE, q->cmd_size, GFP_KERNEL);

	if (!q->fq)

		return -ENOMEM;