Index: linux-2.6.git/arch/um/sys-i386/Makefile
===================================================================
--- linux-2.6.git.orig/arch/um/sys-i386/Makefile
+++ linux-2.6.git/arch/um/sys-i386/Makefile
@@ -5,9 +5,13 @@ obj-y = bitops.o bugs.o checksum.o delay
 obj-$(CONFIG_HIGHMEM) += highmem.o
 obj-$(CONFIG_MODULES) += module.o
 
+# XXX: Should be lib? Supported here? For bitops.o we currently don't care.
+#lib-$(CONFIG_X86_USE_3DNOW) += mmx.o
+obj-$(CONFIG_X86_USE_3DNOW) += mmx.o
+
 USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o
 
-SYMLINKS = bitops.c semaphore.c highmem.c module.c
+SYMLINKS = bitops.c semaphore.c highmem.c module.c mmx.c
 
 include arch/um/scripts/Makefile.rules
 
@@ -15,6 +19,7 @@ bitops.c-dir = lib
 semaphore.c-dir = kernel
 highmem.c-dir = mm
 module.c-dir = kernel
+mmx.c-dir = lib
 
 $(obj)/stub_segv.o : _c_flags = $(call unprofile,$(CFLAGS))
 
Index: linux-2.6.git/include/asm-um/mmx.h
===================================================================
--- /dev/null
+++ linux-2.6.git/include/asm-um/mmx.h
@@ -0,0 +1,6 @@
+#ifndef __UM_MMX_H
+#define __UM_MMX_H
+
+#include "asm/arch/mmx.h"
+
+#endif