Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-2.6.18

diff --combined Makefile
index c53ed56,1589085..8406d02
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 18
 -EXTRAVERSION = -rc3
 +EXTRAVERSION = -rc4
  NAME=Crazed Snow-Weasel
  
  # *DOCUMENTATION*
@@@ -309,9 -309,6 +309,6 @@@ CPPFLAGS        := -D__KERNEL__ $(LINUX
  
  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)
- 
  AFLAGS          := -D__ASSEMBLY__
  
  # Read KERNELRELEASE from include/config/kernel.release (if it exists)
@@@ -486,6 -483,8 +483,8 @@@ els
  CFLAGS                += -O2
  endif
  
+ include $(srctree)/arch/$(ARCH)/Makefile
+ 
  ifdef CONFIG_FRAME_POINTER
  CFLAGS                += -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,)
  else
@@@ -500,7 -499,8 +499,8 @@@ ifdef CONFIG_DEBUG_INF
  CFLAGS                += -g
  endif
  
- include $(srctree)/arch/$(ARCH)/Makefile
+ # Force gcc to behave correct even for buggy distributions
+ CFLAGS          += $(call cc-option, -fno-stack-protector)
  
  # arch Makefile may override CC so keep this after arch Makefile is included
  NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)