Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / include / asm-xtensa / sigcontext.h

diff --git a/include/asm-xtensa/sigcontext.h b/include/asm-xtensa/sigcontext.h
index a75177291418d5302c72ca2c032a560c90ac23dc..03383af8c3b789f94920983f57c976aeb1b8094a 100644 (file)
--- a/include/asm-xtensa/sigcontext.h
+++ b/include/asm-xtensa/sigcontext.h
@@ -5,40 +5,24 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 2001 - 2003 Tensilica Inc.
+ * Copyright (C) 2001 - 2007 Tensilica Inc.
  */
 
 #ifndef _XTENSA_SIGCONTEXT_H
 #define _XTENSA_SIGCONTEXT_H
 
-#define _ASMLANGUAGE
-#include <asm/processor.h>
-#include <asm/coprocessor.h>
-
-
-struct _cpstate {
-       unsigned char _cpstate[XTENSA_CP_EXTRA_SIZE];
-} __attribute__ ((aligned (XTENSA_CP_EXTRA_ALIGN)));
-
 
 struct sigcontext {
-       unsigned long   oldmask;
-
-       /* CPU registers */
        unsigned long sc_pc;
        unsigned long sc_ps;
-       unsigned long sc_wmask;
-       unsigned long sc_windowbase;
-       unsigned long sc_windowstart;
        unsigned long sc_lbeg;
        unsigned long sc_lend;
        unsigned long sc_lcount;
        unsigned long sc_sar;
-       unsigned long sc_depc;
-       unsigned long sc_dareg0;
-       unsigned long sc_treg[4];
-       unsigned long sc_areg[XCHAL_NUM_AREGS];
-       struct _cpstate *sc_cpstate;
+       unsigned long sc_acclo;
+       unsigned long sc_acchi;
+       unsigned long sc_a[16];
+       void *sc_xtregs;
 };
 
-#endif /* __ASM_XTENSA_SIGCONTEXT_H */
+#endif /* _XTENSA_SIGCONTEXT_H */