diff --git a/[refs] b/[refs]
index 3d4bb887c197..c1d65cac5b61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a08b6b7968e7a6afc75e365ac31830867275abdc
+refs/heads/master: 90dffc03ca8caa0ea047f11c81fe61cd86d80568
diff --git a/trunk/arch/um/Makefile-i386 b/trunk/arch/um/Makefile-i386
index a777e57dbf89..1ab431a53ac3 100644
--- a/trunk/arch/um/Makefile-i386
+++ b/trunk/arch/um/Makefile-i386
@@ -27,7 +27,7 @@ export LDFLAGS HOSTCFLAGS HOSTLDFLAGS UML_OBJCOPYFLAGS
 endif
 endif
 
-CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH) $(STUB_CFLAGS)
+CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH)
 
 ifneq ($(CONFIG_GPROF),y)
 ARCH_CFLAGS += -DUM_FASTCALL