diff src/share/vm/prims/jvmtiImpl.cpp @ 7969:1eae78177059

Merge
author jiangli
date Fri, 01 Feb 2013 15:25:37 -0500
parents 8b46b0196eb0
children 5fc51c1ecdeb 47bc9800972c
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiImpl.cpp	Thu Jan 24 10:57:38 2013 -0800
+++ b/src/share/vm/prims/jvmtiImpl.cpp	Fri Feb 01 15:25:37 2013 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -905,8 +905,6 @@
 #endif
 }
 
-#ifndef KERNEL
-
 JvmtiDeferredEvent JvmtiDeferredEvent::compiled_method_load_event(
     nmethod* nm) {
   JvmtiDeferredEvent event = JvmtiDeferredEvent(TYPE_COMPILED_METHOD_LOAD);
@@ -1098,5 +1096,3 @@
     }
   }
 }
-
-#endif // ndef KERNEL