diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-30 23:08:33 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-30 23:08:33 -0400 |
| commit | 930861c4e6f13ce2e7d06cd1ef11441a065517d9 (patch) | |
| tree | df6ff01f89768ff8d6fe6a64491be30e6e56c3e0 /include/linux/stackprotector.h | |
| parent | 8b112171734c791afaf43ccc8c6ec492e7006e44 (diff) | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/stackprotector.h')
| -rw-r--r-- | include/linux/stackprotector.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/linux/stackprotector.h b/include/linux/stackprotector.h new file mode 100644 index 000000000000..6f3e54c704c0 --- /dev/null +++ b/include/linux/stackprotector.h | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | #ifndef _LINUX_STACKPROTECTOR_H | ||
| 2 | #define _LINUX_STACKPROTECTOR_H 1 | ||
| 3 | |||
| 4 | #include <linux/compiler.h> | ||
| 5 | #include <linux/sched.h> | ||
| 6 | #include <linux/random.h> | ||
| 7 | |||
| 8 | #ifdef CONFIG_CC_STACKPROTECTOR | ||
| 9 | # include <asm/stackprotector.h> | ||
| 10 | #else | ||
| 11 | static inline void boot_init_stack_canary(void) | ||
| 12 | { | ||
| 13 | } | ||
| 14 | #endif | ||
| 15 | |||
| 16 | #endif | ||