# HG changeset patch
# User asaha
# Date 1418836257 28800
# Node ID 7622232b7efaa79e8e10367f3e44e8329dd5c7ca
# Parent  01850e3a5b0645f209d8a952abb37a343afb1b80# Parent  c4f1e23c41399a8558f70fdbff14666a7ed4a41f
Merge

diff -r c4f1e23c4139 -r 7622232b7efa .hgtags
--- a/.hgtags	Tue Dec 16 14:02:00 2014 -0800
+++ b/.hgtags	Wed Dec 17 09:10:57 2014 -0800
@@ -577,3 +577,5 @@
 fc1f9b67fd8c5d5cd94ecc03569d93e7ce7fb574 jdk8u40-b17
 bc5a90a4db47f1c497d7894434c42325f595cd02 hs25.40-b22
 31d3306aad29e39929418ed43f28212a5f5306a3 jdk8u40-b18
+b95f13f05f553309cd74d6ccf8fcedb259c6716c jdk8u45-b00
+41c3c456e326185053f0654be838f4b0bfb38078 jdk8u45-b01
diff -r c4f1e23c4139 -r 7622232b7efa make/hotspot_version
--- a/make/hotspot_version	Tue Dec 16 14:02:00 2014 -0800
+++ b/make/hotspot_version	Wed Dec 17 09:10:57 2014 -0800
@@ -34,8 +34,8 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2015
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=40
-HS_BUILD_NUMBER=22
+HS_MINOR_VER=45
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8
diff -r c4f1e23c4139 -r 7622232b7efa src/os/bsd/vm/perfMemory_bsd.cpp
diff -r c4f1e23c4139 -r 7622232b7efa src/os/linux/vm/perfMemory_linux.cpp
diff -r c4f1e23c4139 -r 7622232b7efa src/os/solaris/vm/perfMemory_solaris.cpp
diff -r c4f1e23c4139 -r 7622232b7efa src/share/vm/code/dependencies.cpp
diff -r c4f1e23c4139 -r 7622232b7efa src/share/vm/code/dependencies.hpp
diff -r c4f1e23c4139 -r 7622232b7efa src/share/vm/oops/instanceKlass.cpp
diff -r c4f1e23c4139 -r 7622232b7efa src/share/vm/oops/instanceKlass.hpp
diff -r c4f1e23c4139 -r 7622232b7efa src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Tue Dec 16 14:02:00 2014 -0800
+++ b/src/share/vm/runtime/arguments.cpp	Wed Dec 17 09:10:57 2014 -0800
@@ -2310,7 +2310,7 @@
                                         "G1ConcMarkStepDurationMillis");
     status = status && verify_interval(G1ConcRSHotCardLimit, 0, max_jubyte,
                                        "G1ConcRSHotCardLimit");
-    status = status && verify_interval(G1ConcRSLogCacheSize, 0, 31,
+    status = status && verify_interval(G1ConcRSLogCacheSize, 0, 27,
                                        "G1ConcRSLogCacheSize");
     status = status && verify_interval(StringDeduplicationAgeThreshold, 1, markOopDesc::max_age,
                                        "StringDeduplicationAgeThreshold");
diff -r c4f1e23c4139 -r 7622232b7efa src/share/vm/utilities/vmError.cpp