From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Feb 2017 02:37:03 +0000 (-0800)
Subject: Merge tag 'openrisc-for-linus' of git://github.com/openrisc/linux
X-Git-Tag: v4.11-rc1~78
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4.10.0-09686-g9e31489;p=karo-tx-linux.git

Merge tag 'openrisc-for-linus' of git://github.com/openrisc/linux

Pull OpenRISC updates from Stafford Horne:
 "Highlights include:

   - optimized memset and memcpy routines, ~20% boot time saving

   - support for cpu idling

   - adding support for l.swa and l.lwa atomic operations (in spec from
     2014)

   - use atomics to implement: bitops, cmpxchg, futex

   - the atomics are in preparation for SMP support"

* tag 'openrisc-for-linus' of git://github.com/openrisc/linux: (25 commits)
  openrisc: head: Init r0 to 0 on start
  openrisc: Export ioremap symbols used by modules
  arch/openrisc/lib/memcpy.c: use correct OR1200 option
  openrisc: head: Remove unused strings
  openrisc: head: Move init strings to rodata section
  openrisc: entry: Fix delay slot detection
  openrisc: entry: Whitespace and comment cleanups
  scripts/checkstack.pl: Add openrisc support
  MAINTAINERS: Add the openrisc official repository
  openrisc: Add .gitignore
  openrisc: Add optimized memcpy routine
  openrisc: Add optimized memset
  openrisc: Initial support for the idle state
  openrisc: Fix the bitmask for the unit present register
  openrisc: remove unnecessary stddef.h include
  openrisc: add futex_atomic_* implementations
  openrisc: add optimized atomic operations
  openrisc: add cmpxchg and xchg implementations
  openrisc: add atomic bitops
  openrisc: add l.lwa/l.swa emulation
  ...
---

9e314890292c0dd357eadef6a043704fa0b4c157
diff --cc arch/openrisc/include/asm/Kbuild
index ef8d1ccc3e45,a669c141436e..fb241757f7f0
--- a/arch/openrisc/include/asm/Kbuild
+++ b/arch/openrisc/include/asm/Kbuild
@@@ -10,8 -9,7 +9,6 @@@ generic-y += bugs.
  generic-y += cacheflush.h
  generic-y += checksum.h
  generic-y += clkdev.h
- generic-y += cmpxchg-local.h
- generic-y += cmpxchg.h
 -generic-y += cputime.h
  generic-y += current.h
  generic-y += device.h
  generic-y += div64.h
diff --cc scripts/checkstack.pl
index 694a075381b0,42794348ef35..3033be701e9a
--- a/scripts/checkstack.pl
+++ b/scripts/checkstack.pl
@@@ -78,9 -78,9 +78,12 @@@ my (@stack, $re, $dre, $x, $xs, $funcre
  	} elsif ($arch eq 'mips') {
  		#88003254:       27bdffe0        addiu   sp,sp,-32
  		$re = qr/.*addiu.*sp,sp,-(([0-9]{2}|[3-9])[0-9]{2})/o;
 +	} elsif ($arch eq 'nios2') {
 +		#25a8:	defffb04 	addi	sp,sp,-20
 +		$re = qr/.*addi.*sp,sp,-(([0-9]{2}|[3-9])[0-9]{2})/o;
+ 	} elsif ($arch eq 'openrisc') {
+ 		# c000043c:       9c 21 fe f0     l.addi r1,r1,-272
+ 		$re = qr/.*l\.addi.*r1,r1,-(([0-9]{2}|[3-9])[0-9]{2})/o;
  	} elsif ($arch eq 'parisc' || $arch eq 'parisc64') {
  		$re = qr/.*ldo ($x{1,8})\(sp\),sp/o;
  	} elsif ($arch eq 'ppc') {