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

Commit e497cb59 authored by Xin Li's avatar Xin Li
Browse files

Merge 4.4.60 into android-4.4 



Changes in 4.4.60:
	libceph: force GFP_NOIO for socket allocations
	xen/setup: Don't relocate p2m over existing one
	scsi: mpt3sas: fix hang on ata passthrough commands
	scsi: sg: check length passed to SG_NEXT_CMD_LEN
	scsi: libsas: fix ata xfer length
	ALSA: seq: Fix race during FIFO resize
	ALSA: hda - fix a problem for lineout on a Dell AIO machine
	ASoC: atmel-classd: fix audio clock rate
	ACPI: Fix incompatibility with mcount-based function graph tracing
	ACPI: Do not create a platform_device for IOAPIC/IOxAPIC
	tty/serial: atmel: fix race condition (TX+DMA)
	tty/serial: atmel: fix TX path in atmel_console_write()
	USB: fix linked-list corruption in rh_call_control()
	KVM: x86: clear bus pointer when destroyed
	drm/radeon: Override fpfn for all VRAM placements in radeon_evict_flags
	mm, hugetlb: use pte_present() instead of pmd_present() in follow_huge_pmd()
	MIPS: Lantiq: Fix cascaded IRQ setup
	rtc: s35390a: fix reading out alarm
	rtc: s35390a: make sure all members in the output are set
	rtc: s35390a: implement reset routine as suggested by the reference
	rtc: s35390a: improve irq handling
	KVM: kvm_io_bus_unregister_dev() should never fail
	power: reset: at91-poweroff: timely shutdown LPDDR memories
	blk: improve order of bio handling in generic_make_request()
	blk: Ensure users for current->bio_list can see the full list.
	padata: avoid race in reordering
	Linux 4.4.60

Change-Id: I705c78ccae62ca59f922164085e7ca03ad4ecc6b
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 84b60019 8f8ee970

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 59

SUBLEVEL = 60

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/mips/lantiq/irq.c

+17 −21
Original line number Diff line number Diff line
@@ -269,6 +269,11 @@ static void ltq_hw5_irqdispatch(void) 
DEFINE_HWx_IRQDISPATCH(5)

#endif



static void ltq_hw_irq_handler(struct irq_desc *desc)

{

	ltq_hw_irqdispatch(irq_desc_get_irq(desc) - 2);

}



#ifdef CONFIG_MIPS_MT_SMP

void __init arch_init_ipiirq(int irq, struct irqaction *action)

{
@@ -313,23 +318,19 @@ static struct irqaction irq_call = { 
asmlinkage void plat_irq_dispatch(void)

{

	unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;

	unsigned int i;

	int irq;



	if ((MIPS_CPU_TIMER_IRQ == 7) && (pending & CAUSEF_IP7)) {

		do_IRQ(MIPS_CPU_TIMER_IRQ);

		goto out;

	} else {

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

			if (pending & (CAUSEF_IP2 << i)) {

				ltq_hw_irqdispatch(i);

				goto out;

			}

		}

	if (!pending) {

		spurious_interrupt();

		return;

	}

	pr_alert("Spurious IRQ: CAUSE=0x%08x\n", read_c0_status());



out:

	return;

	pending >>= CAUSEB_IP;

	while (pending) {

		irq = fls(pending) - 1;

		do_IRQ(MIPS_CPU_IRQ_BASE + irq);

		pending &= ~BIT(irq);

	}

}



static int icu_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)
@@ -354,11 +355,6 @@ static const struct irq_domain_ops irq_domain_ops = { 
	.map = icu_map,

};



static struct irqaction cascade = {

	.handler = no_action,

	.name = "cascade",

};



int __init icu_of_init(struct device_node *node, struct device_node *parent)

{

	struct device_node *eiu_node;
@@ -390,7 +386,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent) 
	mips_cpu_irq_init();



	for (i = 0; i < MAX_IM; i++)

		setup_irq(i + 2, &cascade);

		irq_set_chained_handler(i + 2, ltq_hw_irq_handler);



	if (cpu_has_vint) {

		pr_info("Setting up vectored interrupts\n");

arch/x86/xen/setup.c

+3 −3
Original line number Diff line number Diff line
@@ -713,10 +713,9 @@ static void __init xen_reserve_xen_mfnlist(void) 
		size = PFN_PHYS(xen_start_info->nr_p2m_frames);

	}



	if (!xen_is_e820_reserved(start, size)) {

	memblock_reserve(start, size);

	if (!xen_is_e820_reserved(start, size))

		return;

	}



#ifdef CONFIG_X86_32

	/*
@@ -727,6 +726,7 @@ static void __init xen_reserve_xen_mfnlist(void) 
	BUG();

#else

	xen_relocate_p2m();

	memblock_free(start, size);

#endif

}

block/bio.c

+9 −3
Original line number Diff line number Diff line
@@ -373,10 +373,14 @@ static void punt_bios_to_rescuer(struct bio_set *bs) 
	bio_list_init(&punt);

	bio_list_init(&nopunt);



	while ((bio = bio_list_pop(current->bio_list)))

	while ((bio = bio_list_pop(&current->bio_list[0])))

		bio_list_add(bio->bi_pool == bs ? &punt : &nopunt, bio);

	current->bio_list[0] = nopunt;



	*current->bio_list = nopunt;

	bio_list_init(&nopunt);

	while ((bio = bio_list_pop(&current->bio_list[1])))

		bio_list_add(bio->bi_pool == bs ? &punt : &nopunt, bio);

	current->bio_list[1] = nopunt;



	spin_lock(&bs->rescue_lock);

	bio_list_merge(&bs->rescue_list, &punt);
@@ -464,7 +468,9 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, int nr_iovecs, struct bio_set *bs) 
		 * we retry with the original gfp_flags.

		 */



		if (current->bio_list && !bio_list_empty(current->bio_list))

		if (current->bio_list &&

		    (!bio_list_empty(&current->bio_list[0]) ||

		     !bio_list_empty(&current->bio_list[1])))

			gfp_mask &= ~__GFP_DIRECT_RECLAIM;



		p = mempool_alloc(bs->bio_pool, gfp_mask);

block/blk-core.c

+31 −9
Original line number Diff line number Diff line
@@ -2023,7 +2023,14 @@ end_io: 
 */

blk_qc_t generic_make_request(struct bio *bio)

{

	struct bio_list bio_list_on_stack;

	/*

	 * bio_list_on_stack[0] contains bios submitted by the current

	 * make_request_fn.

	 * bio_list_on_stack[1] contains bios that were submitted before

	 * the current make_request_fn, but that haven't been processed

	 * yet.

	 */

	struct bio_list bio_list_on_stack[2];

	blk_qc_t ret = BLK_QC_T_NONE;



	if (!generic_make_request_checks(bio))
@@ -2040,7 +2047,7 @@ blk_qc_t generic_make_request(struct bio *bio) 
	 * should be added at the tail

	 */

	if (current->bio_list) {

		bio_list_add(current->bio_list, bio);

		bio_list_add(&current->bio_list[0], bio);

		goto out;

	}
@@ -2059,24 +2066,39 @@ blk_qc_t generic_make_request(struct bio *bio) 
	 * bio_list, and call into ->make_request() again.

	 */

	BUG_ON(bio->bi_next);

	bio_list_init(&bio_list_on_stack);

	current->bio_list = &bio_list_on_stack;

	bio_list_init(&bio_list_on_stack[0]);

	current->bio_list = bio_list_on_stack;

	do {

		struct request_queue *q = bdev_get_queue(bio->bi_bdev);



		if (likely(blk_queue_enter(q, __GFP_DIRECT_RECLAIM) == 0)) {

			struct bio_list lower, same;



			/* Create a fresh bio_list for all subordinate requests */

			bio_list_on_stack[1] = bio_list_on_stack[0];

			bio_list_init(&bio_list_on_stack[0]);



			ret = q->make_request_fn(q, bio);



			blk_queue_exit(q);



			bio = bio_list_pop(current->bio_list);

			/* sort new bios into those for a lower level

			 * and those for the same level

			 */

			bio_list_init(&lower);

			bio_list_init(&same);

			while ((bio = bio_list_pop(&bio_list_on_stack[0])) != NULL)

				if (q == bdev_get_queue(bio->bi_bdev))

					bio_list_add(&same, bio);

				else

					bio_list_add(&lower, bio);

			/* now assemble so we handle the lowest level first */

			bio_list_merge(&bio_list_on_stack[0], &lower);

			bio_list_merge(&bio_list_on_stack[0], &same);

			bio_list_merge(&bio_list_on_stack[0], &bio_list_on_stack[1]);

		} else {

			struct bio *bio_next = bio_list_pop(current->bio_list);



			bio_io_error(bio);

			bio = bio_next;

		}

		bio = bio_list_pop(&bio_list_on_stack[0]);

	} while (bio);

	current->bio_list = NULL; /* deactivate */