Merge git://git.linux-xtensa.org/kernel/xtensa-feed

* git://git.linux-xtensa.org/kernel/xtensa-feed:
  Xtensa: use asm-generic/fcntl.h
  [XTENSA] Remove non-rt signal handling
  [XTENSA] Move common sections into bss sections
  [XTENSA] clean-up header files
  [XTENSA] Use generic 64-bit division
  [XTENSA] Remove multi-exported symbols from xtensa_ksyms.c
  [XTENSA] fix sources using deprecated assembler directive
  [XTENSA] Spelling fixes in arch/xtensa
  [XTENSA] fix bit operations in bitops.h

1 files changed, 5 insertions, 19 deletions

diff --git a/include/asm-xtensa/sigcontext.h b/include/asm-xtensa/sigcontext.h
index a75177291418..e3381cee5059 100644
--- a/include/asm-xtensa/sigcontext.h
+++ b/include/asm-xtensa/sigcontext.h
@@ -5,21 +5,12 @@
  * 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;
@@ -27,18 +18,13 @@ struct sigcontext {
         /* 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];
 };
 
-#endif /* __ASM_XTENSA_SIGCONTEXT_H */
+#endif /* _XTENSA_SIGCONTEXT_H */