diff --git a/ChangeLog b/ChangeLog
index a979b2f609..b52cb81b60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/i386/i686/multiarch/init-arch.c (ENABLE_SSSE3_ON_ATOM):
+	Removed.
+	* sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features): Don't
+	turn off SSSE3 on Atom.
+
 2009-08-28  Ulrich Drepper  <drepper@redhat.com>
 
 	* stdlib/tst-strtol.c (tests): More tests.
diff --git a/sysdeps/i386/i686/multiarch/init-arch.c b/sysdeps/i386/i686/multiarch/init-arch.c
index b371bae1dc..00a94d83dc 100644
--- a/sysdeps/i386/i686/multiarch/init-arch.c
+++ b/sysdeps/i386/i686/multiarch/init-arch.c
@@ -1,3 +1 @@
-#define ENABLE_SSSE3_ON_ATOM
-
 #include <sysdeps/x86_64/multiarch/init-arch.c>
diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c
index c152ab29eb..9a1e776c9a 100644
--- a/sysdeps/x86_64/multiarch/init-arch.c
+++ b/sysdeps/x86_64/multiarch/init-arch.c
@@ -64,15 +64,7 @@ __init_cpu_features (void)
 	  __cpu_features.model += extended_model;
 	}
       else if (__cpu_features.family == 0x06)
-	{
-	  __cpu_features.model += extended_model;
-
-#ifndef ENABLE_SSSE3_ON_ATOM
-	  if (__cpu_features.model == 0x1c)
-	    /* Avoid SSSE3 on Atom since it is slow.  */
-	    __cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx &= ~(1 << 9);
-#endif
-	}
+	__cpu_features.model += extended_model;
     }
   /* This spells out "AuthenticAMD".  */
   else if (ebx == 0x68747541 && ecx == 0x444d4163 && edx == 0x69746e65)