Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / arch / arm / lib / Makefile
index c0e6583..7b726b6 100644 (file)
@@ -7,13 +7,27 @@
 lib-y          := backtrace.o changebit.o csumipv6.o csumpartial.o   \
                   csumpartialcopy.o csumpartialcopyuser.o clearbit.o \
                   copy_page.o delay.o findbit.o memchr.o memcpy.o    \
-                  memset.o memzero.o setbit.o strncpy_from_user.o    \
-                  strnlen_user.o strchr.o strrchr.o testchangebit.o  \
-                  testclearbit.o testsetbit.o uaccess.o getuser.o    \
-                  putuser.o ashldi3.o ashrdi3.o lshrdi3.o muldi3.o   \
-                  ucmpdi2.o udivdi3.o lib1funcs.o div64.o            \
+                  memmove.o memset.o memzero.o setbit.o              \
+                  strncpy_from_user.o strnlen_user.o                 \
+                  strchr.o strrchr.o                                 \
+                  testchangebit.o testclearbit.o testsetbit.o        \
+                  getuser.o putuser.o clear_user.o                   \
+                  ashldi3.o ashrdi3.o lshrdi3.o muldi3.o             \
+                  ucmpdi2.o lib1funcs.o div64.o sha1.o               \
                   io-readsb.o io-writesb.o io-readsl.o io-writesl.o
 
+# the code in uaccess.S is not preemption safe and
+# probably faster on ARMv3 only
+ifeq ($(CONFIG_PREEMPT),y)
+  lib-y        += copy_from_user.o copy_to_user.o
+else
+ifneq ($(CONFIG_CPU_32v3),y)
+  lib-y        += copy_from_user.o copy_to_user.o
+else
+  lib-y        += uaccess.o
+endif
+endif
+
 ifeq ($(CONFIG_CPU_32v3),y)
   lib-y        += io-readsw-armv3.o io-writesw-armv3.o
 else