Merge branch 'from-linus' into upstream (dea58b80) · Commits · e / devices / android_kernel_xiaomi_nabu

Documentation/serial/driver

+5 −4

Original line number	Diff line number	Diff line
		@@ -214,12 +214,13 @@ hardware.
		The interaction of the iflag bits is as follows (parity error
		given as an example):
		Parity error INPCK IGNPAR
		None n/a n/a character received
		Yes n/a 0 character discarded
		Yes 0 1 character received, marked as
		n/a 0 n/a character received, marked as
		TTY_NORMAL
		Yes 1 1 character received, marked as
		None 1 n/a character received, marked as
		TTY_NORMAL
		Yes 1 0 character received, marked as
		TTY_PARITY
		Yes 1 1 character discarded

		Other flags may be used (eg, xon/xoff characters) if your
		hardware supports hardware "soft" flow control.

+8 −2

Original line number	Diff line number	Diff line
		@@ -565,7 +565,7 @@ BROADBAND PROCESSOR ARCHITECTURE
		P: Arnd Bergmann
		M: arnd@arndb.de
		L: linuxppc-dev@ozlabs.org
		W: http://linuxppc64.org
		W: http://www.penguinppc.org/ppc64/
		S: Supported

		BTTV VIDEO4LINUX DRIVER
		@@ -1716,7 +1716,7 @@ M: paulus@au.ibm.com
		P: Anton Blanchard
		M: anton@samba.org
		M: anton@au.ibm.com
		W: http://linuxppc64.org
		W: http://www.penguinppc.org/ppc64/
		L: linuxppc-dev@ozlabs.org
		S: Supported

		@@ -1899,6 +1899,12 @@ M: James.Bottomley@HansenPartnership.com
		L: linux-scsi@vger.kernel.org
		S: Maintained

		NETEM NETWORK EMULATOR
		P: Stephen Hemminger
		M: shemminger@osdl.org
		L: netem@osdl.org
		S: Maintained

		NETFILTER/IPTABLES/IPCHAINS
		P: Rusty Russell
		P: Marc Boucher

+15 −3

Original line number	Diff line number	Diff line
		@@ -178,8 +178,12 @@ static int ixp23xx_irq_set_type(unsigned int irq, unsigned int type)

		static void ixp23xx_irq_mask(unsigned int irq)
		{
		volatile unsigned long *intr_reg = IXP23XX_INTR_EN1 + (irq / 32);
		volatile unsigned long *intr_reg;

		if (irq >= 56)
		irq += 8;

		intr_reg = IXP23XX_INTR_EN1 + (irq / 32);
		*intr_reg &= ~(1 << (irq % 32));
		}

		@@ -199,17 +203,25 @@ static void ixp23xx_irq_ack(unsigned int irq)
		*/
		static void ixp23xx_irq_level_unmask(unsigned int irq)
		{
		volatile unsigned long *intr_reg = IXP23XX_INTR_EN1 + (irq / 32);
		volatile unsigned long *intr_reg;

		ixp23xx_irq_ack(irq);

		if (irq >= 56)
		irq += 8;

		intr_reg = IXP23XX_INTR_EN1 + (irq / 32);
		*intr_reg \|= (1 << (irq % 32));
		}

		static void ixp23xx_irq_edge_unmask(unsigned int irq)
		{
		volatile unsigned long *intr_reg = IXP23XX_INTR_EN1 + (irq / 32);
		volatile unsigned long *intr_reg;

		if (irq >= 56)
		irq += 8;

		intr_reg = IXP23XX_INTR_EN1 + (irq / 32);
		*intr_reg \|= (1 << (irq % 32));
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -376,7 +376,7 @@ void __init build_mem_type_table(void)
		ecc_mask = 0;
		}

		if (cpu_arch <= CPU_ARCH_ARMv5TEJ) {
		if (cpu_arch <= CPU_ARCH_ARMv5TEJ && !cpu_is_xscale()) {
		for (i = 0; i < ARRAY_SIZE(mem_types); i++) {
		if (mem_types[i].prot_l1)
		mem_types[i].prot_l1 \|= PMD_BIT4;
		@@ -631,7 +631,7 @@ void setup_mm_for_reboot(char mode)
		pgd = init_mm.pgd;

		base_pmdval = PMD_SECT_AP_WRITE \| PMD_SECT_AP_READ \| PMD_TYPE_SECT;
		if (cpu_architecture() <= CPU_ARCH_ARMv5TEJ)
		if (cpu_architecture() <= CPU_ARCH_ARMv5TEJ && !cpu_is_xscale())
		base_pmdval \|= PMD_BIT4;

		for (i = 0; i < FIRST_USER_PGD_NR + USER_PTRS_PER_PGD; i++, pgd++) {

+2 −1

Original line number	Diff line number	Diff line
		@@ -427,12 +427,13 @@ __xsc3_setup:
		#endif
		mcr p15, 0, r0, c1, c0, 1 @ set auxiliary control reg
		mrc p15, 0, r0, c1, c0, 0 @ get control register
		bic r0, r0, #0x0200 @ .... ..R. .... ....
		bic r0, r0, #0x0002 @ .... .... .... ..A.
		orr r0, r0, #0x0005 @ .... .... .... .C.M
		#if BTB_ENABLE
		bic r0, r0, #0x0200 @ .... ..R. .... ....
		orr r0, r0, #0x3900 @ ..VI Z..S .... ....
		#else
		bic r0, r0, #0x0a00 @ .... Z.R. .... ....
		orr r0, r0, #0x3100 @ ..VI ...S .... ....
		#endif
		#if L2_CACHE_ENABLE