Merge "Merge android-4.9.123 (8dd3fc2) into msm-4.9" (709ba50a) · Commits · e / devices / android_kernel_fairphone_FP3

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 122
		SUBLEVEL = 123
		EXTRAVERSION =
		NAME = Roaring Lionus

arch/x86/include/asm/pgtable.h

+8 −5

Original line number	Diff line number	Diff line
		@@ -190,6 +190,11 @@ static inline unsigned long pud_pfn(pud_t pud)
		return (pfn & pud_pfn_mask(pud)) >> PAGE_SHIFT;
		}

		static inline unsigned long pgd_pfn(pgd_t pgd)
		{
		return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
		}

		#define pte_page(pte) pfn_to_page(pte_pfn(pte))

		static inline int pmd_large(pmd_t pte)
		@@ -621,8 +626,7 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)
		* Currently stuck as a macro due to indirect forward reference to
		* linux/mmzone.h's __section_mem_map_addr() definition:
		*/
		#define pmd_page(pmd) \
		pfn_to_page((pmd_val(pmd) & pmd_pfn_mask(pmd)) >> PAGE_SHIFT)
		#define pmd_page(pmd) pfn_to_page(pmd_pfn(pmd))

		/*
		* the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD]
		@@ -690,8 +694,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
		* Currently stuck as a macro due to indirect forward reference to
		* linux/mmzone.h's __section_mem_map_addr() definition:
		*/
		#define pud_page(pud) \
		pfn_to_page((pud_val(pud) & pud_pfn_mask(pud)) >> PAGE_SHIFT)
		#define pud_page(pud) pfn_to_page(pud_pfn(pud))

		/* Find an entry in the second-level page table.. */
		static inline pmd_t pmd_offset(pud_t pud, unsigned long address)
		@@ -731,7 +734,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
		* Currently stuck as a macro due to indirect forward reference to
		* linux/mmzone.h's __section_mem_map_addr() definition:
		*/
		#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
		#define pgd_page(pgd) pfn_to_page(pgd_pfn(pgd))

		/* to find an entry in a page-table-directory. */
		static inline unsigned long pud_index(unsigned long address)

drivers/acpi/sleep.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -330,6 +330,14 @@ static struct dmi_system_id acpisleep_dmi_table[] __initdata = {
		DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"),
		},
		},
		{
		.callback = init_nvs_save_s3,
		.ident = "Asus 1025C",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
		DMI_MATCH(DMI_PRODUCT_NAME, "1025C"),
		},
		},
		/*
		* https://bugzilla.kernel.org/show_bug.cgi?id=189431
		* Lenovo G50-45 is a platform later than 2012, but needs nvs memory

drivers/isdn/i4l/isdn_common.c

+1 −7

Original line number	Diff line number	Diff line
		@@ -1655,13 +1655,7 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
		} else
		return -EINVAL;
		case IIOCDBGVAR:
		if (arg) {
		if (copy_to_user(argp, &dev, sizeof(ulong)))
		return -EFAULT;
		return 0;
		} else
		return -EINVAL;
		break;
		default:
		if ((cmd & IIOCDRVCTL) == IIOCDRVCTL)
		cmd = ((cmd >> _IOC_NRSHIFT) & _IOC_NRMASK) & ISDN_DRVIOCTL_MASK;

drivers/tty/serial/8250/8250_dw.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -235,7 +235,7 @@ static void dw8250_set_termios(struct uart_port p, struct ktermios termios,
		unsigned int rate;
		int ret;

		if (IS_ERR(d->clk) \|\| !old)
		if (IS_ERR(d->clk))
		goto out;

		clk_disable_unprepare(d->clk);
		@@ -626,6 +626,7 @@ static const struct acpi_device_id dw8250_acpi_match[] = {
		{ "APMC0D08", 0},
		{ "AMD0020", 0 },
		{ "AMDI0020", 0 },
		{ "BRCM2032", 0 },
		{ "HISI0031", 0 },
		{ },
		};