diff -r e056a98ac7ca -r bb0cc62ab037 hotspot/src/cpu/zero/vm/globals_zero.hpp
--- a/hotspot/src/cpu/zero/vm/globals_zero.hpp	Fri Feb 12 09:19:10 2016 +0100
+++ b/hotspot/src/cpu/zero/vm/globals_zero.hpp	Mon Feb 15 05:54:59 2016 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -32,7 +32,6 @@
 // Set the default values for platform dependent flags used by the
 // runtime system.  See globals.hpp for details of what they do.
 
-define_pd_global(bool,  ConvertSleepToYield,  true);
 define_pd_global(bool,  ShareVtableStubs,     true);
 define_pd_global(bool,  NeedsDeoptSuspend,    false);