From a6765c72262263e3c942bb1abd8d8af4dc964aed Mon Sep 17 00:00:00 2001
From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Date: Tue, 18 Aug 2009 15:06:02 +0900
Subject: [PATCH] --- yaml --- r: 158342 b: refs/heads/master c:
 1314562a9ae5f39f6f595656023c1baf970831ef h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/sched.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 544e6b3c28de..fee49644bf9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e5b59a2d728e6963b35dba8bb36e0b70267462e
+refs/heads/master: 1314562a9ae5f39f6f595656023c1baf970831ef
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index 195d72d5c102..7bc2d9290837 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -1237,8 +1237,10 @@ struct task_struct {
 	pid_t pid;
 	pid_t tgid;
 
+#ifdef CONFIG_CC_STACKPROTECTOR
 	/* Canary value for the -fstack-protector gcc feature */
 	unsigned long stack_canary;
+#endif
 
 	/* 
 	 * pointers to (original) parent process, youngest child, younger sibling,