diff -r 9925b07bba5b -r 5c6dacbd17ae hotspot/src/share/vm/runtime/globals.hpp
--- a/hotspot/src/share/vm/runtime/globals.hpp	Fri Apr 17 10:53:31 2015 +0200
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Fri Apr 17 14:37:20 2015 -0700
@@ -3909,7 +3909,10 @@
           "Enable event-based tracing")                                     \
                                                                             \
   product(bool, UseLockedTracing, false,                                    \
-          "Use locked-tracing when doing event-based tracing")
+          "Use locked-tracing when doing event-based tracing")              \
+                                                                            \
+  diagnostic(bool, UseUnalignedAccesses, false,                             \
+          "Use unaligned memory accesses in sun.misc.Unsafe")
 
 /*
  *  Macros for factoring of globals