--- old/src/share/vm/oops/klass.cpp	2016-01-21 19:08:30.230281344 -0500
+++ new/src/share/vm/oops/klass.cpp	2016-01-21 19:08:30.027596846 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,7 @@
 #include "trace/traceMacros.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/stack.inline.hpp"
+#include "logging/log.hpp"
 #if INCLUDE_ALL_GCS
 #include "gc/g1/g1SATBCardTableModRefBS.hpp"
 #endif // INCLUDE_ALL_GCS
@@ -386,9 +387,9 @@
     Klass* sub = current->subklass();
     while (sub != NULL && !sub->is_loader_alive(is_alive)) {
 #ifndef PRODUCT
-      if (TraceClassUnloading && WizardMode) {
+      if (log_is_enabled(Trace, classunload)) {
         ResourceMark rm;
-        tty->print_cr("[Unlinking class (subclass) %s]", sub->external_name());
+        log_trace(classunload)("unlinking class (subclass): %s", sub->external_name());
       }
 #endif
       sub = sub->next_sibling();
@@ -401,9 +402,9 @@
     // Find and set the first alive sibling
     Klass* sibling = current->next_sibling();
     while (sibling != NULL && !sibling->is_loader_alive(is_alive)) {
-      if (TraceClassUnloading && WizardMode) {
+      if (log_is_enabled(Trace, classunload)) {
         ResourceMark rm;
-        tty->print_cr("[Unlinking class (sibling) %s]", sibling->external_name());
+        log_trace(classunload)("[Unlinking class (sibling) %s]", sibling->external_name());
       }
       sibling = sibling->next_sibling();
     }