# HG changeset patch
# User stefank
# Date 1355418398 28800
# Node ID 0df51ba096f7dc49d4e0fd0c94be2d25e387f40e
# Parent  b2a47eb9940440c423962b3f511364d3fbacc6b0# Parent  ce8a60f3dbe3a8f13dd5c535c2435722acc73503
Merge

diff -r b2a47eb99404 -r 0df51ba096f7 hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp	Thu Dec 13 10:09:49 2012 +0100
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp	Thu Dec 13 09:06:38 2012 -0800
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp"
+#include "memory/allocation.inline.hpp"
 #include "runtime/java.hpp"
 
 AdjoiningVirtualSpaces::AdjoiningVirtualSpaces(ReservedSpace rs,
diff -r b2a47eb99404 -r 0df51ba096f7 hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp
--- a/hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp	Thu Dec 13 10:09:49 2012 +0100
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp	Thu Dec 13 09:06:38 2012 -0800
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "gc_implementation/shared/gcStats.hpp"
 #include "gc_implementation/shared/gcUtil.hpp"
+#include "memory/allocation.inline.hpp"
 
 GCStats::GCStats() {
     _avg_promoted       = new AdaptivePaddedNoZeroDevAverage(