Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[deliverable/linux.git] / arch / blackfin / include / asm / pda.h

diff --git a/arch/blackfin/include/asm/pda.h b/arch/blackfin/include/asm/pda.h
index b42555c1431cb5683605af10918389d151aeb708..a6f95695731d99ebda1cb14e5823f362f53b5d26 100644 (file)
--- a/arch/blackfin/include/asm/pda.h
+++ b/arch/blackfin/include/asm/pda.h
@@ -50,6 +50,7 @@ struct blackfin_pda {                 /* Per-processor Data Area */
        unsigned long ex_optr;
        unsigned long ex_buf[4];
        unsigned long ex_imask;         /* Saved imask from exception */
+       unsigned long ex_ipend;         /* Saved IPEND from exception */
        unsigned long *ex_stack;        /* Exception stack space */
 
 #ifdef ANOMALY_05000261
@@ -60,6 +61,12 @@ struct blackfin_pda {                        /* Per-processor Data Area */
        unsigned long retx;
        unsigned long seqstat;
        unsigned int __nmi_count;       /* number of times NMI asserted on this CPU */
+#ifdef CONFIG_DEBUG_DOUBLEFAULT
+       unsigned long dcplb_doublefault_addr;
+       unsigned long icplb_doublefault_addr;
+       unsigned long retx_doublefault;
+       unsigned long seqstat_doublefault;
+#endif
 };
 
 extern struct blackfin_pda cpu_pda[];