From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 26 Sep 2012 00:21:46 +0000 (+1000)
Subject: Merge remote-tracking branch 's390/features'
X-Git-Tag: next-20120926~110
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a96fddc083376c4d25479cee455c4056c1718112;p=karo-tx-linux.git

Merge remote-tracking branch 's390/features'
---

a96fddc083376c4d25479cee455c4056c1718112
diff --cc include/linux/elf.h
index 1e935e4c6328,f930b1a390ab..0a05051a8924
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@@ -387,10 -387,8 +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 */