---

yaml --- r: 136754 b: refs/heads/master c: 76397f7 h: refs/heads/master v: v3
git-mirror · Feb 9, 2009 · 3f51079 · 3f51079
1 parent 4ae05ad
commit 3f51079
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cd61c0baa8bce32271226198b46c67a7a05d108
+refs/heads/master: 76397f72fb9f4c9a96dfe05462887811c81b0e17
diff --git a/trunk/arch/x86/include/asm/stackprotector.h b/trunk/arch/x86/include/asm/stackprotector.h
@@ -1,8 +1,12 @@
 #ifndef _ASM_STACKPROTECTOR_H
 #define _ASM_STACKPROTECTOR_H 1
 
+#ifdef CONFIG_CC_STACKPROTECTOR
+
 #include <asm/tsc.h>
 #include <asm/processor.h>
+#include <asm/percpu.h>
+#include <linux/random.h>
 
 /*
  * Initialize the stackprotector canary value.
@@ -35,4 +39,5 @@ static __always_inline void boot_init_stack_canary(void)
 	percpu_write(irq_stack_union.stack_canary, canary);
 }
 
-#endif
+#endif	/* CC_STACKPROTECTOR */
+#endif	/* _ASM_STACKPROTECTOR_H */