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

Commit 116ef0fc authored by Russell King's avatar Russell King
Browse files

Merge branches 'fixes' and 'misc' into for-next

parents 9ffecb10 38850d78 a4283e41

Documentation/arm/SA1100/Victor

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
Victor is known as a "digital talking book player" manufactured by

VisuAide, Inc. to be used by blind people.



For more information related to Victor, see:



	http://www.humanware.com/en-usa/products



Of course Victor is using Linux as its main operating system.

The Victor implementation for Linux is maintained by Nicolas Pitre:



	nico@visuaide.com

	nico@fluxnic.net



For any comments, please feel free to contact me through the above

addresses.

Documentation/arm/memory.txt

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ VMALLOC_START VMALLOC_END-1 vmalloc() / ioremap() space. 
				located here through iotable_init().

				VMALLOC_START is based upon the value

				of the high_memory variable, and VMALLOC_END

				is equal to 0xff000000.

				is equal to 0xff800000.



PAGE_OFFSET	high_memory-1	Kernel direct-mapped RAM region.

				This maps the platforms RAM, and typically

Documentation/devicetree/bindings/arm/twd.txt

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,11 @@ interrupts. 
- reg : Specify the base address and the size of the TWD timer

	register window.



Optional



- always-on : a boolean property. If present, the timer is powered through

  an always-on power domain, therefore it never loses context.



Example:



	twd-timer@2c000600 {

arch/arm/Kconfig

+6 −2
Original line number Diff line number Diff line
@@ -645,6 +645,7 @@ config ARCH_SHMOBILE_LEGACY 


config ARCH_RPC

	bool "RiscPC"

	depends on MMU

	select ARCH_ACORN

	select ARCH_MAY_HAVE_PC_FDC

	select ARCH_SPARSEMEM_ENABLE
@@ -1410,7 +1411,6 @@ config HAVE_ARM_ARCH_TIMER 


config HAVE_ARM_TWD

	bool

	depends on SMP

	select CLKSRC_OF if OF

	help

	  This options enables support for the ARM timer and watchdog unit
@@ -1470,6 +1470,8 @@ choice 


	config VMSPLIT_3G

		bool "3G/1G user/kernel split"

	config VMSPLIT_3G_OPT

		bool "3G/1G user/kernel split (for full 1G low memory)"

	config VMSPLIT_2G

		bool "2G/2G user/kernel split"

	config VMSPLIT_1G
@@ -1481,6 +1483,7 @@ config PAGE_OFFSET 
	default PHYS_OFFSET if !MMU

	default 0x40000000 if VMSPLIT_1G

	default 0x80000000 if VMSPLIT_2G

	default 0xB0000000 if VMSPLIT_3G_OPT

	default 0xC0000000



config NR_CPUS
@@ -1695,8 +1698,9 @@ config HIGHMEM 
	  If unsure, say n.



config HIGHPTE

	bool "Allocate 2nd-level pagetables from highmem"

	bool "Allocate 2nd-level pagetables from highmem" if EXPERT

	depends on HIGHMEM

	default y

	help

	  The VM uses one page of physical memory for each page table.

	  For systems with a lot of processes, this can use a lot of

arch/arm/include/asm/cmpxchg.h

+12 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size 


	switch (size) {

#if __LINUX_ARM_ARCH__ >= 6

#ifndef CONFIG_CPU_V6 /* MIN ARCH >= V6K */

	case 1:

		asm volatile("@	__xchg1\n"

		"1:	ldrexb	%0, [%3]\n"
@@ -49,6 +50,17 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size 
			: "r" (x), "r" (ptr)

			: "memory", "cc");

		break;

	case 2:

		asm volatile("@	__xchg2\n"

		"1:	ldrexh	%0, [%3]\n"

		"	strexh	%1, %2, [%3]\n"

		"	teq	%1, #0\n"

		"	bne	1b"

			: "=&r" (ret), "=&r" (tmp)

			: "r" (x), "r" (ptr)

			: "memory", "cc");

		break;

#endif

	case 4:

		asm volatile("@	__xchg4\n"

		"1:	ldrex	%0, [%3]\n"