Mercurial > hg > truffle

diff src/share/vm/runtime/vm_version.cpp @ 8037:9425ba04792d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author brutisso
date Thu, 07 Feb 2013 18:40:45 -0800
parents 8b46b0196eb0
children 5fc51c1ecdeb 9960dce2024f
line wrap: on
line diff
--- a/src/share/vm/runtime/vm_version.cpp	Thu Feb 07 15:51:25 2013 +0100
+++ b/src/share/vm/runtime/vm_version.cpp	Thu Feb 07 18:40:45 2013 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -111,9 +111,6 @@
 #endif
 
 #ifndef VMTYPE
-  #ifdef KERNEL
-    #define VMTYPE "Kernel"
-  #else // KERNEL
   #ifdef TIERED
     #define VMTYPE "Server"
   #else // TIERED
@@ -128,7 +125,6 @@
                     COMPILER2_PRESENT("Server")
   #endif // ZERO
   #endif // TIERED
-  #endif // KERNEL
 #endif
 
 #ifndef HOTSPOT_VM_DISTRO