From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Dec 2014 21:12:47 +0000 (-0800)
Subject: Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64... 
X-Git-Tag: MMI-PSA29.97-13-9~11079
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b64bb1d758163814687eb3b84d74e56f04d0c9d1;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'arm64-upstream' of git://git./linux/kernel/git/arm64/linux

Pull arm64 updates from Will Deacon:
 "Here's the usual mixed bag of arm64 updates, also including some
  related EFI changes (Acked by Matt) and the MMU gather range cleanup
  (Acked by you).

  Changes include:
   - support for alternative instruction patching from Andre
   - seccomp from Akashi
   - some AArch32 instruction emulation, required by the Android folks
   - optimisations for exception entry/exit code, cmpxchg, pcpu atomics
   - mmu_gather range calculations moved into core code
   - EFI updates from Ard, including long-awaited SMBIOS support
   - /proc/cpuinfo fixes to align with the format used by arch/arm/
   - a few non-critical fixes across the architecture"

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (70 commits)
  arm64: remove the unnecessary arm64_swiotlb_init()
  arm64: add module support for alternatives fixups
  arm64: perf: Prevent wraparound during overflow
  arm64/include/asm: Fixed a warning about 'struct pt_regs'
  arm64: Provide a namespace to NCAPS
  arm64: bpf: lift restriction on last instruction
  arm64: Implement support for read-mostly sections
  arm64: compat: align cacheflush syscall with arch/arm
  arm64: add seccomp support
  arm64: add SIGSYS siginfo for compat task
  arm64: add seccomp syscall for compat task
  asm-generic: add generic seccomp.h for secure computing mode 1
  arm64: ptrace: allow tracer to skip a system call
  arm64: ptrace: add NT_ARM_SYSTEM_CALL regset
  arm64: Move some head.text functions to executable section
  arm64: jump labels: NOP out NOP -> NOP replacement
  arm64: add support to dump the kernel page tables
  arm64: Add FIX_HOLE to permanent fixed addresses
  arm64: alternatives: fix pr_fmt string for consistency
  arm64: vmlinux.lds.S: don't discard .exit.* sections at link-time
  ...
---

b64bb1d758163814687eb3b84d74e56f04d0c9d1
diff --cc arch/arm64/kernel/efi-entry.S
index d18a44940968,a0016d3a17da..8ce9b0577442
--- a/arch/arm64/kernel/efi-entry.S
+++ b/arch/arm64/kernel/efi-entry.S
@@@ -61,10 -61,12 +61,11 @@@ ENTRY(efi_stub_entry
  	 */
  	mov	x20, x0		// DTB address
  	ldr	x0, [sp, #16]	// relocated _text address
- 	mov	x21, x0
+ 	ldr	x21, =stext_offset
+ 	add	x21, x0, x21
  
  	/*
 -	 * Flush dcache covering current runtime addresses
 -	 * of kernel text/data. Then flush all of icache.
 +	 * Calculate size of the kernel Image (same for original and copy).
  	 */
  	adrp	x1, _text
  	add	x1, x1, #:lo12:_text