diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index 1d3ff1b2e69..0f9218e592f 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -6772,7 +6772,9 @@ class StubGenerator: public StubCodeGenerator {
 
 #ifdef LINUX
 
+#if 0  // JDK-8261660: disabled for now.
     generate_atomic_entry_points();
+#endif
 
 #endif // LINUX