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

Commit 7838c48a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.4.188 into android-4.4-p 



Changes in 4.4.188
	ARM: riscpc: fix DMA
	ARM: dts: rockchip: Mark that the rk3288 timer might stop in suspend
	kernel/module.c: Only return -EEXIST for modules that have finished loading
	MIPS: lantiq: Fix bitfield masking
	dmaengine: rcar-dmac: Reject zero-length slave DMA requests
	fs/adfs: super: fix use-after-free bug
	btrfs: fix minimum number of chunk errors for DUP
	ceph: fix improper use of smp_mb__before_atomic()
	scsi: zfcp: fix GCC compiler warning emitted with -Wmaybe-uninitialized
	ACPI: fix false-positive -Wuninitialized warning
	be2net: Signal that the device cannot transmit during reconfiguration
	x86/apic: Silence -Wtype-limits compiler warnings
	x86: math-emu: Hide clang warnings for 16-bit overflow
	mm/cma.c: fail if fixed declaration can't be honored
	coda: add error handling for fget
	coda: fix build using bare-metal toolchain
	uapi linux/coda_psdev.h: move upc_req definition from uapi to kernel side headers
	ipc/mqueue.c: only perform resource calculation if user valid
	x86/kvm: Don't call kvm_spurious_fault() from .fixup
	selinux: fix memory leak in policydb_init()
	s390/dasd: fix endless loop after read unit address configuration
	xen/swiotlb: fix condition for calling xen_destroy_contiguous_region()
	Linux 4.4.188

Change-Id: I6ed0db8e205744849b0242a9fd12b38f728077e0
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 0e1b964a d63f4f25

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 187

SUBLEVEL = 188

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/boot/dts/rk3288.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ 
			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,

			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;

		clock-frequency = <24000000>;

		arm,no-tick-in-suspend;

	};



	timer: timer@ff810000 {

arch/arm/mach-rpc/dma.c

+4 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static irqreturn_t iomd_dma_handle(int irq, void *dev_id) 
	} while (1);



	idma->state = ~DMA_ST_AB;

	disable_irq(irq);

	disable_irq_nosync(irq);



	return IRQ_HANDLED;

}
@@ -174,6 +174,9 @@ static void iomd_enable_dma(unsigned int chan, dma_t *dma) 
				DMA_FROM_DEVICE : DMA_TO_DEVICE);

		}



		idma->dma_addr = idma->dma.sg->dma_address;

		idma->dma_len = idma->dma.sg->length;



		iomd_writeb(DMA_CR_C, dma_base + CR);

		idma->state = DMA_ST_AB;

	}

arch/mips/lantiq/irq.c

+3 −2
Original line number Diff line number Diff line
@@ -160,8 +160,9 @@ static int ltq_eiu_settype(struct irq_data *d, unsigned int type) 
			if (edge)

				irq_set_handler(d->hwirq, handle_edge_irq);



			ltq_eiu_w32(ltq_eiu_r32(LTQ_EIU_EXIN_C) |

				(val << (i * 4)), LTQ_EIU_EXIN_C);

			ltq_eiu_w32((ltq_eiu_r32(LTQ_EIU_EXIN_C) &

				    (~(7 << (i * 4)))) | (val << (i * 4)),

				    LTQ_EIU_EXIN_C);

		}

	}

arch/x86/include/asm/apic.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static inline void generic_apic_probe(void) 


#ifdef CONFIG_X86_LOCAL_APIC



extern unsigned int apic_verbosity;

extern int apic_verbosity;

extern int local_apic_timer_c2_ok;



extern int disable_apic;