1 files changed, 6 insertions, 1 deletions

diff --git a/include/asm-x86_64/pda.h b/include/asm-x86_64/pda.h
index 6794ffaae433..e7773e0af865 100644
--- a/include/asm-x86_64/pda.h
+++ b/include/asm-x86_64/pda.h
@@ -16,7 +16,12 @@ struct x8664_pda {
         unsigned long oldrsp;       /* 24 user rsp for system call */
         int irqcount;               /* 32 Irq nesting counter. Starts with -1 */
         int cpunumber;              /* 36 Logical CPU number */
-        char *irqstackptr;      /* 40 top of irqstack */
+#ifdef CONFIG_CC_STACKPROTECTOR
+        unsigned long stack_canary;     /* 40 stack canary value */
+                                        /* gcc-ABI: this canary MUST be at
+                                           offset 40!!! */
+#endif
+        char *irqstackptr;
         int nodenumber;             /* number of current node */
         unsigned int __softirq_pending;
         unsigned int __nmi_count;       /* number of NMI on this CPUs */