From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Oct 2012 18:51:57 +0000 (-0700)
Subject: Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas... 
X-Git-Tag: v3.7-rc1~178
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=81f56e5375e84689b891e0e6c5a02ec12a1f18d9;p=~emulex%2Finfiniband.git

Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64

Pull arm64 support from Catalin Marinas:
 "Linux support for the 64-bit ARM architecture (AArch64)

  Features currently supported:
   - 39-bit address space for user and kernel (each)
   - 4KB and 64KB page configurations
   - Compat (32-bit) user applications (ARMv7, EABI only)
   - Flattened Device Tree (mandated for all AArch64 platforms)
   - ARM generic timers"

* tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: (35 commits)
  arm64: ptrace: remove obsolete ptrace request numbers from user headers
  arm64: Do not set the SMP/nAMP processor bit
  arm64: MAINTAINERS update
  arm64: Build infrastructure
  arm64: Miscellaneous header files
  arm64: Generic timers support
  arm64: Loadable modules
  arm64: Miscellaneous library functions
  arm64: Performance counters support
  arm64: Add support for /proc/sys/debug/exception-trace
  arm64: Debugging support
  arm64: Floating point and SIMD
  arm64: 32-bit (compat) applications support
  arm64: User access library functions
  arm64: Signal handling support
  arm64: VDSO support
  arm64: System calls handling
  arm64: ELF definitions
  arm64: SMP support
  arm64: DMA mapping API
  ...
---

81f56e5375e84689b891e0e6c5a02ec12a1f18d9
diff --cc include/linux/elf.h
index f930b1a390a,1e935e4c632..0a05051a892
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@@ -387,8 -387,10 +387,11 @@@ typedef struct elf64_shdr 
  #define NT_S390_PREFIX	0x305		/* s390 prefix register */
  #define NT_S390_LAST_BREAK	0x306	/* s390 breaking event address */
  #define NT_S390_SYSTEM_CALL	0x307	/* s390 system call restart data */
 +#define NT_S390_TDB	0x308		/* s390 transaction diagnostic block */
  #define NT_ARM_VFP	0x400		/* ARM VFP/NEON registers */
+ #define NT_ARM_TLS	0x401		/* ARM TLS register */
+ #define NT_ARM_HW_BREAK	0x402		/* ARM hardware breakpoint registers */
+ #define NT_ARM_HW_WATCH	0x403		/* ARM hardware watchpoint registers */
  
  
  /* Note header in a PT_NOTE section */