--- a/hotspot/src/share/vm/runtime/globals.hpp	Fri Mar 27 08:58:45 2015 +0100
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Tue Mar 31 12:31:18 2015 -0700
@@ -3912,7 +3912,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