--- old/src/share/vm/memory/metaspaceTracer.cpp	2014-03-13 16:04:32.598649693 +0100
+++ new/src/share/vm/memory/metaspaceTracer.cpp	2014-03-13 16:04:32.498649688 +0100
@@ -25,13 +25,8 @@
 #include "precompiled.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "memory/metaspaceTracer.hpp"
-#include "runtime/frame.hpp"
-#include "runtime/os.hpp"
-#include "runtime/thread.inline.hpp"
 #include "trace/tracing.hpp"
 #include "trace/traceBackend.hpp"
-#include "utilities/decoder.hpp"
-#include "utilities/ostream.hpp"
 
 void MetaspaceTracer::report_gc_threshold(size_t old_val,
                                           size_t new_val,
@@ -45,45 +40,6 @@
   }
 }
 
-static bool get_method_name(address pc, char *buf, size_t buflen) {
-  if (os::address_is_in_vm(pc) && Decoder::can_decode_C_frame_in_vm()) {
-    return os::dll_address_to_function_name(pc, buf, (int) buflen, 0);
-  }
-  return false;
-}
-
-static bool is_valid_frame_in_vm(const frame* f) {
-  return f->pc() && os::address_is_in_vm(f->pc()) && !f->is_java_frame();
-}
-
-static void write_vm_stack_trace(outputStream *stream) {
-  const size_t max_num_frames = 64;
-  size_t num_frames = 0;
-
-  const size_t buflen = 256;
-  char *buf = NEW_RESOURCE_ARRAY(char, buflen);
-
-  Thread* current_thread = Thread::current();
-  frame fr = os::current_frame();
-  while (is_valid_frame_in_vm(&fr) && num_frames < max_num_frames) {
-    if (get_method_name(fr.pc(), buf, buflen)) {
-      stream->print_cr("%s", buf);
-    } else {
-      stream->print_cr(PTR_FORMAT, fr.pc());
-    }
-
-    // Check if it safe to get the caller's stack frame.
-    if (fr.safe_for_sender(current_thread)) {
-      fr = os::get_sender_for_C_frame(&fr);
-    } else {
-      // Not safe to traverse the stack any further.
-      return;
-    }
-
-    num_frames++;
-  }
-}
-
 void MetaspaceTracer::report_metaspace_allocation_failure(ClassLoaderData *cld,
                                                           size_t word_size,
                                                           MetaspaceObj::Type objtype,
@@ -102,16 +58,6 @@
       event.set_anonymousClassLoader(false);
     }
 
-#ifdef _WINDOWS
-    // Can not walk the stack on Windows using the frame pointer.
-    event.set_nativeStackTrace(NULL);
-#else
-    ResourceMark rm;
-    stringStream stack_trace;
-    write_vm_stack_trace(&stack_trace);
-    event.set_nativeStackTrace(stack_trace.as_string());
-#endif
-
     event.set_size(word_size * BytesPerWord);
     event.set_metadataType((u1) mdtype);
     event.set_metaspaceObjectType((u1) objtype);