diff -r e45861098f5a -r fec48bf5a827 hotspot/src/share/vm/asm/codeBuffer.cpp
--- a/hotspot/src/share/vm/asm/codeBuffer.cpp	Mon May 11 16:30:26 2015 +0200
+++ b/hotspot/src/share/vm/asm/codeBuffer.cpp	Wed May 13 15:16:06 2015 +0200
@@ -25,7 +25,7 @@
 #include "precompiled.hpp"
 #include "asm/codeBuffer.hpp"
 #include "compiler/disassembler.hpp"
-#include "memory/gcLocker.hpp"
+#include "gc/shared/gcLocker.hpp"
 #include "oops/methodData.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/icache.hpp"