--- old/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp	2015-05-12 11:40:17.957322863 +0200
+++ /dev/null	2015-03-18 17:10:38.111854831 +0100
@@ -1,71 +0,0 @@
-/*
- * 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSOLDGEN_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSOLDGEN_HPP
-
-#include "gc_implementation/parallelScavenge/objectStartArray.hpp"
-#include "gc_implementation/parallelScavenge/psOldGen.hpp"
-#include "gc_implementation/parallelScavenge/psVirtualspace.hpp"
-#include "gc_implementation/shared/generationCounters.hpp"
-#include "gc_implementation/shared/mutableSpace.hpp"
-#include "gc_implementation/shared/spaceCounters.hpp"
-
-class ASPSOldGen : public PSOldGen {
-  friend class VMStructs;
-  size_t _gen_size_limit;  // Largest size the generation's reserved size
-                           // can grow.
- public:
-  ASPSOldGen(size_t initial_byte_size,
-             size_t minimum_byte_size,
-             size_t byte_size_limit,
-             const char* gen_name, int level);
-  ASPSOldGen(PSVirtualSpace* vs,
-             size_t initial_byte_size,
-             size_t minimum_byte_size,
-             size_t byte_size_limit,
-             const char* gen_name, int level);
-  size_t gen_size_limit()               { return _gen_size_limit; }
-  size_t max_gen_size()                 { return _reserved.byte_size(); }
-  void set_gen_size_limit(size_t v)     { _gen_size_limit = v; }
-
-  virtual void initialize_work(const char* perf_data_name, int level);
-
-  // After a shrink or expand reset the generation
-  void reset_after_change();
-
-  // Return number of bytes that the virtual space in the generation is willing
-  // to expand or contract.  The results from these methods should feed into the
-  // decisions about adjusting the virtual space.
-  size_t available_for_expansion();
-  size_t available_for_contraction();
-
-  // Accessors
-  void set_reserved(MemRegion v) { _reserved = v; }
-
-  // Debugging support
-  virtual const char* short_name() const { return "ASPSOldGen"; }
-};
-
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSOLDGEN_HPP
--- /dev/null	2015-03-18 17:10:38.111854831 +0100
+++ new/src/share/vm/gc/parallel/asPSOldGen.hpp	2015-05-12 11:40:17.724313158 +0200
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2003, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_GC_PARALLEL_ASPSOLDGEN_HPP
+#define SHARE_VM_GC_PARALLEL_ASPSOLDGEN_HPP
+
+#include "gc/parallel/objectStartArray.hpp"
+#include "gc/parallel/psOldGen.hpp"
+#include "gc/parallel/psVirtualspace.hpp"
+#include "gc/shared/generationCounters.hpp"
+#include "gc/shared/mutableSpace.hpp"
+#include "gc/shared/spaceCounters.hpp"
+
+class ASPSOldGen : public PSOldGen {
+  friend class VMStructs;
+  size_t _gen_size_limit;  // Largest size the generation's reserved size
+                           // can grow.
+ public:
+  ASPSOldGen(size_t initial_byte_size,
+             size_t minimum_byte_size,
+             size_t byte_size_limit,
+             const char* gen_name, int level);
+  ASPSOldGen(PSVirtualSpace* vs,
+             size_t initial_byte_size,
+             size_t minimum_byte_size,
+             size_t byte_size_limit,
+             const char* gen_name, int level);
+  size_t gen_size_limit()               { return _gen_size_limit; }
+  size_t max_gen_size()                 { return _reserved.byte_size(); }
+  void set_gen_size_limit(size_t v)     { _gen_size_limit = v; }
+
+  virtual void initialize_work(const char* perf_data_name, int level);
+
+  // After a shrink or expand reset the generation
+  void reset_after_change();
+
+  // Return number of bytes that the virtual space in the generation is willing
+  // to expand or contract.  The results from these methods should feed into the
+  // decisions about adjusting the virtual space.
+  size_t available_for_expansion();
+  size_t available_for_contraction();
+
+  // Accessors
+  void set_reserved(MemRegion v) { _reserved = v; }
+
+  // Debugging support
+  virtual const char* short_name() const { return "ASPSOldGen"; }
+};
+
+#endif // SHARE_VM_GC_PARALLEL_ASPSOLDGEN_HPP