From 48c97b1953626bfe1289d650119d63b4e51b3990 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 6 May 2008 17:09:27 -0700
Subject: [PATCH] --- yaml --- r: 96114 b: refs/heads/master c:
 c0a18111e571138747a98af18b3a2124df56a0d1 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/arch/um/Makefile | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ddc17378649b..f6326d6e06b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db176c6ed8974fae94328ad5ac9e70b094ff22fd
+refs/heads/master: c0a18111e571138747a98af18b3a2124df56a0d1
diff --git a/trunk/arch/um/Makefile b/trunk/arch/um/Makefile
index 01b97c19a8ba..dbeab15e7bb7 100644
--- a/trunk/arch/um/Makefile
+++ b/trunk/arch/um/Makefile
@@ -77,10 +77,7 @@ include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
 KERNEL_DEFINES = $(strip -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \
 			 -Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES))
 KBUILD_CFLAGS += $(KERNEL_DEFINES)
-# Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use
-# a lot more stack due to the lack of sharing of stacklots:
-KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then \
-			echo $(call cc-option,-fno-unit-at-a-time); fi ;)
+KBUILD_CFLAGS += $(call cc-option,-fno-unit-at-a-time,)
 
 PHONY += linux