--- a/hotspot/src/share/vm/runtime/globals.hpp	Wed Mar 09 20:37:04 2016 +0000
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Wed Mar 09 15:37:33 2016 -0800
@@ -1901,7 +1901,8 @@
                                                                             \
   product(uintx, CMSSamplingGrain, 16*K,                                    \
           "The minimum distance between eden samples for CMS (see above)")  \
-          range(1, max_uintx)                                               \
+          range(ObjectAlignmentInBytes, max_uintx)                          \
+          constraint(CMSSamplingGrainConstraintFunc,AfterMemoryInit)        \
                                                                             \
   product(bool, CMSScavengeBeforeRemark, false,                             \
           "Attempt scavenge before the CMS remark step")                    \