summaryrefslogtreecommitdiffstats
path: root/include/asm-cris/arch-v10/offset.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-07-28 09:30:20 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-07-28 09:30:20 +0100
commit661299d9d0437a0ff72240f3d60016ac3a361a6e (patch)
tree765512576314fc3612b503f182b9ae4e60fcf849 /include/asm-cris/arch-v10/offset.h
parent05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff)
parent41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff)
downloadtalos-op-linux-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.gz
talos-op-linux-661299d9d0437a0ff72240f3d60016ac3a361a6e.zip
Merge with Linus' 2.6 tree
Diffstat (limited to 'include/asm-cris/arch-v10/offset.h')
-rw-r--r--include/asm-cris/arch-v10/offset.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-cris/arch-v10/offset.h b/include/asm-cris/arch-v10/offset.h
index fcbd77eab281..675b51d85639 100644
--- a/include/asm-cris/arch-v10/offset.h
+++ b/include/asm-cris/arch-v10/offset.h
@@ -25,7 +25,7 @@
#define THREAD_usp 4 /* offsetof(struct thread_struct, usp) */
#define THREAD_dccr 8 /* offsetof(struct thread_struct, dccr) */
-#define TASK_pid 133 /* offsetof(struct task_struct, pid) */
+#define TASK_pid 141 /* offsetof(struct task_struct, pid) */
#define LCLONE_VM 256 /* CLONE_VM */
#define LCLONE_UNTRACED 8388608 /* CLONE_UNTRACED */
OpenPOWER on IntegriCloud