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

Commit 2292b51e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.44 into android-4.9 



Changes in 4.9.44
	mm: ratelimit PFNs busy info message
	mm: fix list corruptions on shmem shrinklist
	futex: Remove unnecessary warning from get_futex_key
	xtensa: fix cache aliasing handling code for WT cache
	xtensa: mm/cache: add missing EXPORT_SYMBOLs
	xtensa: don't limit csum_partial export by CONFIG_NET
	mtd: nand: Fix timing setup for NANDs that do not support SET FEATURES
	iscsi-target: fix memory leak in iscsit_setup_text_cmd()
	iscsi-target: Fix iscsi_np reset hung task during parallel delete
	target: Fix node_acl demo-mode + uncached dynamic shutdown regression
	fuse: initialize the flock flag in fuse_file on allocation
	nand: fix wrong default oob layout for small pages using soft ecc
	mmc: mmc: correct the logic for setting HS400ES signal voltage
	nfs/flexfiles: fix leak of nfs4_ff_ds_version arrays
	drm/etnaviv: Fix off-by-one error in reloc checking
	drm/i915: Fix out-of-bounds array access in bdw_load_gamma_lut
	USB: serial: option: add D-Link DWM-222 device ID
	USB: serial: cp210x: add support for Qivicon USB ZigBee dongle
	USB: serial: pl2303: add new ATEN device id
	usb: musb: fix tx fifo flush handling again
	USB: hcd: Mark secondary HCD as dead if the primary one died
	staging:iio:resolver:ad2s1210 fix negative IIO_ANGL_VEL read
	iio: accel: bmc150: Always restore device to normal mode after suspend-resume
	iio: light: tsl2563: use correct event code
	staging: comedi: comedi_fops: do not call blocking ops when !TASK_RUNNING
	uas: Add US_FL_IGNORE_RESIDUE for Initio Corporation INIC-3069
	usb: gadget: udc: renesas_usb3: Fix usb_gadget_giveback_request() calling
	usb: renesas_usbhs: Fix UGCTRL2 value for R-Car Gen3
	USB: Check for dropped connection before switching to full speed
	usb: core: unlink urbs from the tail of the endpoint's urb_list
	usb: quirks: Add no-lpm quirk for Moshi USB to Ethernet Adapter
	usb:xhci:Add quirk for Certain failing HP keyboard on reset after resume
	iio: adc: vf610_adc: Fix VALT selection value for REFSEL bits
	pnfs/blocklayout: require 64-bit sector_t
	pinctrl: sunxi: add a missing function of A10/A20 pinctrl driver
	pinctrl: intel: merrifield: Correct UART pin lists
	pinctrl: uniphier: fix WARN_ON() of pingroups dump on LD11
	pinctrl: uniphier: fix WARN_ON() of pingroups dump on LD20
	pinctrl: samsung: Remove bogus irq_[un]mask from resource management
	pinctrl: meson-gxbb: Add missing GPIODV_18 pin entry
	MIPS: DEC: Fix an int-handler.S CPU_DADDI_WORKAROUNDS regression
	Linux 4.9.44

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents e63ae19e a97a16f1

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 43

SUBLEVEL = 44

EXTRAVERSION =

NAME = Roaring Lionus

arch/mips/dec/int-handler.S

+6 −28
Original line number Diff line number Diff line
@@ -147,23 +147,12 @@ 
		 * Find irq with highest priority

		 */

		# open coded PTR_LA t1, cpu_mask_nr_tbl

#if (_MIPS_SZPTR == 32)

#if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32)

		# open coded la t1, cpu_mask_nr_tbl

		lui	t1, %hi(cpu_mask_nr_tbl)

		addiu	t1, %lo(cpu_mask_nr_tbl)



#endif

#if (_MIPS_SZPTR == 64)

		# open coded dla t1, cpu_mask_nr_tbl

		.set	push

		.set	noat

		lui	t1, %highest(cpu_mask_nr_tbl)

		lui	AT, %hi(cpu_mask_nr_tbl)

		daddiu	t1, t1, %higher(cpu_mask_nr_tbl)

		daddiu	AT, AT, %lo(cpu_mask_nr_tbl)

		dsll	t1, 32

		daddu	t1, t1, AT

		.set	pop

#else

#error GCC `-msym32' option required for 64-bit DECstation builds

#endif

1:		lw	t2,(t1)

		nop
@@ -214,23 +203,12 @@ 
		 * Find irq with highest priority

		 */

		# open coded PTR_LA t1,asic_mask_nr_tbl

#if (_MIPS_SZPTR == 32)

#if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32)

		# open coded la t1, asic_mask_nr_tbl

		lui	t1, %hi(asic_mask_nr_tbl)

		addiu	t1, %lo(asic_mask_nr_tbl)



#endif

#if (_MIPS_SZPTR == 64)

		# open coded dla t1, asic_mask_nr_tbl

		.set	push

		.set	noat

		lui	t1, %highest(asic_mask_nr_tbl)

		lui	AT, %hi(asic_mask_nr_tbl)

		daddiu	t1, t1, %higher(asic_mask_nr_tbl)

		daddiu	AT, AT, %lo(asic_mask_nr_tbl)

		dsll	t1, 32

		daddu	t1, t1, AT

		.set	pop

#else

#error GCC `-msym32' option required for 64-bit DECstation builds

#endif

2:		lw	t2,(t1)

		nop

arch/xtensa/kernel/xtensa_ksyms.c

+0 −2
Original line number Diff line number Diff line
@@ -94,13 +94,11 @@ unsigned long __sync_fetch_and_or_4(unsigned long *p, unsigned long v) 
}

EXPORT_SYMBOL(__sync_fetch_and_or_4);



#ifdef CONFIG_NET

/*

 * Networking support

 */

EXPORT_SYMBOL(csum_partial);

EXPORT_SYMBOL(csum_partial_copy_generic);

#endif /* CONFIG_NET */



/*

 * Architecture-specific symbols

arch/xtensa/mm/cache.c

+8 −8
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ void clear_user_highpage(struct page *page, unsigned long vaddr) 
	clear_page_alias(kvaddr, paddr);

	preempt_enable();

}

EXPORT_SYMBOL(clear_user_highpage);



void copy_user_highpage(struct page *dst, struct page *src,

			unsigned long vaddr, struct vm_area_struct *vma)
@@ -119,10 +120,7 @@ void copy_user_highpage(struct page *dst, struct page *src, 
	copy_page_alias(dst_vaddr, src_vaddr, dst_paddr, src_paddr);

	preempt_enable();

}



#endif /* DCACHE_WAY_SIZE > PAGE_SIZE */



#if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK

EXPORT_SYMBOL(copy_user_highpage);



/*

 * Any time the kernel writes to a user page cache page, or it is about to
@@ -176,7 +174,7 @@ void flush_dcache_page(struct page *page) 


	/* There shouldn't be an entry in the cache for this page anymore. */

}



EXPORT_SYMBOL(flush_dcache_page);



/*

 * For now, flush the whole cache. FIXME??
@@ -188,6 +186,7 @@ void local_flush_cache_range(struct vm_area_struct *vma, 
	__flush_invalidate_dcache_all();

	__invalidate_icache_all();

}

EXPORT_SYMBOL(local_flush_cache_range);



/* 

 * Remove any entry in the cache for this page.
@@ -207,8 +206,9 @@ void local_flush_cache_page(struct vm_area_struct *vma, unsigned long address, 
	__flush_invalidate_dcache_page_alias(virt, phys);

	__invalidate_icache_page_alias(virt, phys);

}

EXPORT_SYMBOL(local_flush_cache_page);



#endif

#endif /* DCACHE_WAY_SIZE > PAGE_SIZE */



void

update_mmu_cache(struct vm_area_struct * vma, unsigned long addr, pte_t *ptep)
@@ -225,7 +225,7 @@ update_mmu_cache(struct vm_area_struct * vma, unsigned long addr, pte_t *ptep) 


	flush_tlb_page(vma, addr);



#if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK

#if (DCACHE_WAY_SIZE > PAGE_SIZE)



	if (!PageReserved(page) && test_bit(PG_arch_1, &page->flags)) {

		unsigned long phys = page_to_phys(page);
@@ -256,7 +256,7 @@ update_mmu_cache(struct vm_area_struct * vma, unsigned long addr, pte_t *ptep) 
 * flush_dcache_page() on the page.

 */



#if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK

#if (DCACHE_WAY_SIZE > PAGE_SIZE)



void copy_to_user_page(struct vm_area_struct *vma, struct page *page,

		unsigned long vaddr, void *dst, const void *src,

drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c

+2 −2
Original line number Diff line number Diff line
@@ -264,8 +264,8 @@ static int submit_reloc(struct etnaviv_gem_submit *submit, void *stream, 
		if (ret)

			return ret;



		if (r->reloc_offset >= bo->obj->base.size - sizeof(*ptr)) {

			DRM_ERROR("relocation %u outside object", i);

		if (r->reloc_offset > bo->obj->base.size - sizeof(*ptr)) {

			DRM_ERROR("relocation %u outside object\n", i);

			return -EINVAL;

		}