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

Commit 316dde2f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 

Pull ARM updates from Russell King:
 "In this ARM merge, we remove more lines than we add.  Changes include:

   - Enable imprecise aborts early, so that bus errors aren't masked
     until later in the boot.  This has the side effect that boot
     loaders which provoke these aborts can cause the kernel to crash
     early in boot, so we install a handler to report this event around
     the site where these are enabled.

   - Remove the buggy but impossible to enable cmpxchg syscall code.

   - Add unwinding annotations to some assembly code.

   - Add support for atomic half-word exchange for ARMv6k+.

   - Reduce ioremap() alignment for SMP/LPAE cases where we don't need
     the large alignment.

   - Addition of an "optimal" 3G configuration for systems with 1G of
     RAM.

   - Increase vmalloc space by 128M.

   - Constify some SMP operations structures, which have never been
     writable.

   - Improve ARMs dma_mmap() support for mapping DMA coherent mappings
     into userspace.

   - Fix to the NMI backtrace code in the IPI case on ARM where the
     failing CPU gets stuck for 10s waiting for its own IPI to be
     delivered.

   - Removal of legacy PM support from the AMBA bus driver.

   - Another fix for the previous fix of vdsomunge"

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (23 commits)
  ARM: 8449/1: fix bug in vdsomunge swab32 macro
  arm: add missing of_node_put
  ARM: 8447/1: catch pending imprecise abort on unmask
  ARM: 8446/1: amba: Remove unused callbacks for legacy system PM
  ARM: 8443/1: Adding support for atomic half word exchange
  ARM: clean up TWD after previous patch
  ARM: 8441/2: twd: Don't set CLOCK_EVT_FEAT_C3STOP unconditionally
  ARM: 8440/1: remove obsolete documentation
  ARM: make highpte an expert option
  ARM: 8433/1: add a VMSPLIT_3G_OPT config option
  ARM: 8439/1: Fix backtrace generation when IPI is masked
  ARM: 8428/1: kgdb: Fix registers on sleeping tasks
  ARM: 8427/1: dma-mapping: add support for offset parameter in dma_mmap()
  ARM: 8426/1: dma-mapping: add missing range check in dma_mmap()
  ARM: remove user cmpxchg syscall
  ARM: 8438/1: Add unwinding to __clear_user_std()
  ARM: 8436/1: hw_breakpoint: remove unnecessary header
  ARM: 8434/2: Revert "7655/1: smp_twd: make twd_local_timer_of_register() no-op for nosmp"
  ARM: 8432/1: move VMALLOC_END from 0xff000000 to 0xff800000
  ARM: 8430/1: use default ioremap alignment for SMP or LPAE
  ...
parents 2c2b8285 116ef0fc

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

+5 −2
Original line number Diff line number Diff line
@@ -1411,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
@@ -1471,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
@@ -1482,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
@@ -1696,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"