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

Commit 5316da5f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.49 into android-4.9 



Changes in 4.9.49
	usb: quirks: add delay init quirk for Corsair Strafe RGB keyboard
	USB: serial: option: add support for D-Link DWM-157 C1
	usb: Add device quirk for Logitech HD Pro Webcam C920-C
	usb:xhci:Fix regression when ATI chipsets detected
	USB: musb: fix external abort on suspend
	USB: core: Avoid race of async_completed() w/ usbdev_release()
	staging/rts5208: fix incorrect shift to extract upper nybble
	iio: adc: ti-ads1015: fix incorrect data rate setting update
	iio: adc: ti-ads1015: fix scale information for ADS1115
	iio: adc: ti-ads1015: enable conversion when CONFIG_PM is not set
	iio: adc: ti-ads1015: avoid getting stale result after runtime resume
	iio: adc: ti-ads1015: don't return invalid value from buffer setup callbacks
	iio: adc: ti-ads1015: add adequate wait time to get correct conversion
	driver core: bus: Fix a potential double free
	intel_th: pci: Add Cannon Lake PCH-H support
	intel_th: pci: Add Cannon Lake PCH-LP support
	ath10k: fix memory leak in rx ring buffer allocation
	Input: trackpoint - assume 3 buttons when buttons detection fails
	rtlwifi: rtl_pci_probe: Fix fail path of _rtl_pci_find_adapter
	Bluetooth: Add support of 13d3:3494 RTL8723BE device
	iwlwifi: pci: add new PCI ID for 7265D
	dlm: avoid double-free on error path in dlm_device_{register,unregister}
	mwifiex: correct channel stat buffer overflows
	MCB: add support for SC31 to mcb-lpc
	s390/mm: avoid empty zero pages for KVM guests to avoid postcopy hangs
	drm/nouveau/pci/msi: disable MSI on big-endian platforms by default
	workqueue: Fix flag collision
	cs5536: add support for IDE controller variant
	scsi: sg: protect against races between mmap() and SG_SET_RESERVED_SIZE
	scsi: sg: recheck MMAP_IO request length with lock held
	drm/bridge: adv7511: Use work_struct to defer hotplug handing to out of irq context
	drm/bridge: adv7511: Switch to using drm_kms_helper_hotplug_event()
	Linux 4.9.49

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 93babebe f07cb348

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 48

SUBLEVEL = 49

EXTRAVERSION =

NAME = Roaring Lionus

arch/s390/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ static inline int mm_alloc_pgste(struct mm_struct *mm) 
 * In the case that a guest uses storage keys

 * faults should no longer be backed by zero pages

 */

#define mm_forbids_zeropage mm_use_skey

#define mm_forbids_zeropage mm_has_pgste

static inline int mm_use_skey(struct mm_struct *mm)

{

#ifdef CONFIG_PGSTE

arch/s390/mm/gmap.c

+32 −7
Original line number Diff line number Diff line
@@ -2124,6 +2124,37 @@ static inline void thp_split_mm(struct mm_struct *mm) 
#endif

}



/*

 * Remove all empty zero pages from the mapping for lazy refaulting

 * - This must be called after mm->context.has_pgste is set, to avoid

 *   future creation of zero pages

 * - This must be called after THP was enabled

 */

static int __zap_zero_pages(pmd_t *pmd, unsigned long start,

			   unsigned long end, struct mm_walk *walk)

{

	unsigned long addr;



	for (addr = start; addr != end; addr += PAGE_SIZE) {

		pte_t *ptep;

		spinlock_t *ptl;



		ptep = pte_offset_map_lock(walk->mm, pmd, addr, &ptl);

		if (is_zero_pfn(pte_pfn(*ptep)))

			ptep_xchg_direct(walk->mm, addr, ptep, __pte(_PAGE_INVALID));

		pte_unmap_unlock(ptep, ptl);

	}

	return 0;

}



static inline void zap_zero_pages(struct mm_struct *mm)

{

	struct mm_walk walk = { .pmd_entry = __zap_zero_pages };



	walk.mm = mm;

	walk_page_range(0, TASK_SIZE, &walk);

}



/*

 * switch on pgstes for its userspace process (for kvm)

 */
@@ -2141,6 +2172,7 @@ int s390_enable_sie(void) 
	mm->context.has_pgste = 1;

	/* split thp mappings and disable thp for future mappings */

	thp_split_mm(mm);

	zap_zero_pages(mm);

	up_write(&mm->mmap_sem);

	return 0;

}
@@ -2153,13 +2185,6 @@ EXPORT_SYMBOL_GPL(s390_enable_sie); 
static int __s390_enable_skey(pte_t *pte, unsigned long addr,

			      unsigned long next, struct mm_walk *walk)

{

	/*

	 * Remove all zero page mappings,

	 * after establishing a policy to forbid zero page mappings

	 * following faults for that page will get fresh anonymous pages

	 */

	if (is_zero_pfn(pte_pfn(*pte)))

		ptep_xchg_direct(walk->mm, addr, pte, __pte(_PAGE_INVALID));

	/* Clear storage key */

	ptep_zap_key(walk->mm, addr, pte);

	return 0;

drivers/ata/pata_amd.c

+1 −0
Original line number Diff line number Diff line
@@ -616,6 +616,7 @@ static const struct pci_device_id amd[] = { 
	{ PCI_VDEVICE(NVIDIA,	PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_IDE),	8 },

	{ PCI_VDEVICE(NVIDIA,	PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE),	8 },

	{ PCI_VDEVICE(AMD,	PCI_DEVICE_ID_AMD_CS5536_IDE),		9 },

	{ PCI_VDEVICE(AMD,	PCI_DEVICE_ID_AMD_CS5536_DEV_IDE),	9 },



	{ },

};

drivers/ata/pata_cs5536.c

+1 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ static int cs5536_init_one(struct pci_dev *dev, const struct pci_device_id *id) 


static const struct pci_device_id cs5536[] = {

	{ PCI_VDEVICE(AMD,	PCI_DEVICE_ID_AMD_CS5536_IDE), },

	{ PCI_VDEVICE(AMD,	PCI_DEVICE_ID_AMD_CS5536_DEV_IDE), },

	{ },

};