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

Commit 4049db73 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.4.139 (7ba55570) into msm-4.4"

parents 62b5f32c e1496b74

Documentation/printk-formats.txt

+1 −2
Original line number Diff line number Diff line
@@ -273,11 +273,10 @@ struct clk: 


	%pC	pll1

	%pCn	pll1

	%pCr	1560000000



	For printing struct clk structures. '%pC' and '%pCn' print the name

	(Common Clock Framework) or address (legacy clock framework) of the

	structure; '%pCr' prints the current clock rate.

	structure.



	Passed by reference.

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 138

SUBLEVEL = 139

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/include/asm/kgdb.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ extern int kgdb_fault_expected; 


#define KGDB_MAX_NO_CPUS	1

#define BUFMAX			400

#define NUMREGBYTES		(DBG_MAX_REG_NUM << 2)

#define NUMREGBYTES		(GDB_MAX_REGS << 2)

#define NUMCRITREGBYTES		(32 << 2)



#define _R0			0

arch/m68k/mm/kmap.c

+2 −1
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ static inline void free_io_area(void *addr) 
	for (p = &iolist ; (tmp = *p) ; p = &tmp->next) {

		if (tmp->addr == addr) {

			*p = tmp->next;

			__iounmap(tmp->addr, tmp->size);

			/* remove gap added in get_io_area() */

			__iounmap(tmp->addr, tmp->size - IO_SIZE);

			kfree(tmp);

			return;

		}

arch/mips/bcm47xx/setup.c

+6 −0
Original line number Diff line number Diff line
@@ -249,6 +249,12 @@ static int __init bcm47xx_cpu_fixes(void) 
		 */

		if (bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4706)

			cpu_wait = NULL;



		/*

		 * BCM47XX Erratum "R10: PCIe Transactions Periodically Fail"

		 * Enable ExternalSync for sync instruction to take effect

		 */

		set_c0_config7(MIPS_CONF7_ES);

		break;

#endif

	}