summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-19 18:59:49 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-19 18:59:49 -0700
commitb8d9598c41e999fb094d3811019248197c54274a (patch)
treef934dada0798c769331886481dd0e7538c2842fd /include
parent01c314a0c0f6367960a7cb1ffb5796560ccaa1c1 (diff)
parent83c4e43722a2c8a8438b8d165047720fd36aaea4 (diff)
downloadtalos-op-linux-b8d9598c41e999fb094d3811019248197c54274a.tar.gz
talos-op-linux-b8d9598c41e999fb094d3811019248197c54274a.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include')
-rw-r--r--include/asm-sparc64/thread_info.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-sparc64/thread_info.h b/include/asm-sparc64/thread_info.h
index 352d9943661a..c94d8b3991bd 100644
--- a/include/asm-sparc64/thread_info.h
+++ b/include/asm-sparc64/thread_info.h
@@ -68,6 +68,9 @@ struct thread_info {
struct restart_block restart_block;
+ struct pt_regs *kern_una_regs;
+ unsigned int kern_una_insn;
+
unsigned long fpregs[0] __attribute__ ((aligned(64)));
};
@@ -103,6 +106,8 @@ struct thread_info {
#define TI_PCR 0x00000490
#define TI_CEE_STUFF 0x00000498
#define TI_RESTART_BLOCK 0x000004a0
+#define TI_KUNA_REGS 0x000004c8
+#define TI_KUNA_INSN 0x000004d0
#define TI_FPREGS 0x00000500
/* We embed this in the uppermost byte of thread_info->flags */
OpenPOWER on IntegriCloud