# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1368153450 25200
# Node ID f7e06c106dda18bd4dd7e3f15320985c20e80c27
# Parent  8851fabf22656e65b898aaab5319177e0bf80a72# Parent  1a009b20f8165c794301f4aa89456c8dc51a860d
Merge.

diff -r 8851fabf2265 -r f7e06c106dda src/os/bsd/vm/gpu_bsd.cpp
--- a/src/os/bsd/vm/gpu_bsd.cpp	Thu May 09 19:21:29 2013 -0700
+++ b/src/os/bsd/vm/gpu_bsd.cpp	Thu May 09 19:37:30 2013 -0700
@@ -26,7 +26,7 @@
 #include "utilities/ostream.hpp"
 
 #ifdef __APPLE__
-#include <CoreGraphics/CoreGraphics.h>
+#include <ApplicationServices/ApplicationServices.h>
 #include <IOKit/IOKitLib.h>
 #endif
 
@@ -96,4 +96,4 @@
   }
   return false;
 }
-#endif
\ No newline at end of file
+#endif
diff -r 8851fabf2265 -r f7e06c106dda src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Thu May 09 19:21:29 2013 -0700
+++ b/src/share/vm/runtime/globals.hpp	Thu May 09 19:37:30 2013 -0700
@@ -3691,7 +3691,7 @@
   product(bool , AllowNonVirtualCalls, false,                               \
           "Obey the ACC_SUPER flag and allow invokenonvirtual calls")       \
                                                                             \
-  develop(bool, TraceWarpLoading, false,                                    \
+  product(bool, TraceWarpLoading, false,                                    \
           "trace external GPU warp loading")                                \
                                                                             \
   experimental(uintx, ArrayAllocatorMallocLimit,                            \