Merge branch 'master' of /home/sam/kernel/linux-2.6/

diff --git a/Makefile b/Makefile
index 4dcf25d43fa6b1aeb30be44bdf0042fd94983ab9..1cc793ff42d434b326a7a0b6ef691112307cc1d5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -309,6 +309,9 @@ CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
 
 CFLAGS          := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
                    -fno-strict-aliasing -fno-common
+# Force gcc to behave correct even for buggy distributions
+CFLAGS          += $(call cc-option, -fno-stack-protector-all \
+                                     -fno-stack-protector)
 AFLAGS          := -D__ASSEMBLY__
 
 # Read KERNELRELEASE from include/config/kernel.release (if it exists)