Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[wrt350n-kernel.git] / include / asm-xtensa / sigcontext.h
blobc9cce5af0d675ff720ad19f4b20a10b10741e80e
1 /*
2 * include/asm-xtensa/sigcontext.h
4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive
6 * for more details.
8 * Copyright (C) 2001 - 2007 Tensilica Inc.
9 */
11 #ifndef _XTENSA_SIGCONTEXT_H
12 #define _XTENSA_SIGCONTEXT_H
15 struct sigcontext {
16 <<<<<<< HEAD:include/asm-xtensa/sigcontext.h
17 unsigned long oldmask;
19 /* CPU registers */
20 =======
21 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/asm-xtensa/sigcontext.h
22 unsigned long sc_pc;
23 unsigned long sc_ps;
24 unsigned long sc_lbeg;
25 unsigned long sc_lend;
26 unsigned long sc_lcount;
27 unsigned long sc_sar;
28 unsigned long sc_acclo;
29 unsigned long sc_acchi;
30 unsigned long sc_a[16];
31 <<<<<<< HEAD:include/asm-xtensa/sigcontext.h
32 =======
33 void *sc_xtregs;
34 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/asm-xtensa/sigcontext.h
37 #endif /* _XTENSA_SIGCONTEXT_H */