Merge branch 'x86-ptrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* 'x86-ptrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, ptrace: Remove set_stopped_child_used_math() in [x]fpregs_set
  x86, ptrace: Simplify xstateregs_get()
  ptrace: Fix ptrace_regset() comments and diagnose errors specifically
  parisc: Disable CONFIG_HAVE_ARCH_TRACEHOOK
  ptrace: Add support for generic PTRACE_GETREGSET/PTRACE_SETREGSET
  x86, ptrace: regset extensions to support xstate

diff --cc arch/x86/kernel/ptrace.c
Simple merge

diff --cc include/linux/elf.h
index 39ad4b2,d8e6e61..ad990c5
--- 1/include/linux/elf.h
--- 2/include/linux/elf.h
+++ b/include/linux/elf.h
@@@ -361,12 -365,8 +365,13 @@@ typedef struct elf64_shdr 
  #define NT_PPC_VSX    0x102           /* PowerPC VSX registers */
  #define NT_386_TLS    0x200           /* i386 TLS slots (struct user_desc) */
  #define NT_386_IOPERM 0x201           /* x86 io permission bitmap (1=deny) */
+ #define NT_X86_XSTATE 0x202           /* x86 extended state using xsave */
  #define NT_S390_HIGH_GPRS     0x300   /* s390 upper register halves */
 +#define NT_S390_TIMER 0x301           /* s390 timer register */
 +#define NT_S390_TODCMP        0x302           /* s390 TOD clock comparator register */
 +#define NT_S390_TODPREG       0x303           /* s390 TOD programmable register */
 +#define NT_S390_CTRS  0x304           /* s390 control registers */
 +#define NT_S390_PREFIX        0x305           /* s390 prefix register */
  
  
  /* Note header in a PT_NOTE section */