# HG changeset patch
# User stefank
# Date 1355418398 28800
# Node ID 4459ef2189f5cdefaf5cec4375250b2ef77f4738
# Parent  2aa953165adeb4b7abb12c03778eea5292378dca# Parent  db8a7163c682a68abc8c59c34622fcfc9deb72d2
Merge

diff -r 2aa953165ade -r 4459ef2189f5 src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp	Thu Dec 13 10:09:49 2012 +0100
+++ b/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 2aa953165ade -r 4459ef2189f5 src/share/vm/gc_implementation/shared/gcStats.cpp
--- a/src/share/vm/gc_implementation/shared/gcStats.cpp	Thu Dec 13 10:09:49 2012 +0100
+++ b/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(