Merge omap-upstream

[linux-2.6-omap-h63xx.git] / include / asm-arm / thread_info.h

diff --git a/include/asm-arm/thread_info.h b/include/asm-arm/thread_info.h
index 41784357a2040a8c9636d035c522a50ce941b8f2..6f7557c04a70a4417ae3fc1fec63988dd17c3f65 100644 (file)
--- a/include/asm-arm/thread_info.h
+++ b/include/asm-arm/thread_info.h
@@ -62,6 +62,9 @@ struct thread_info {
        struct crunch_state     crunchstate;
        union fp_state          fpstate __attribute__((aligned(8)));
        union vfp_state         vfpstate;
+#ifdef CONFIG_ARM_XENON
+       unsigned long           xenonstate;     /* Jazelle-X handler base register */
+#endif
        struct restart_block    restart_block;
 };