diff -r beba2418d973 -r ddc274f0052f hotspot/src/share/vm/gc/shared/collectedHeap.inline.hpp
--- a/hotspot/src/share/vm/gc/shared/collectedHeap.inline.hpp	Fri Jan 29 20:57:09 2016 -0500
+++ b/hotspot/src/share/vm/gc/shared/collectedHeap.inline.hpp	Sat Jan 30 11:02:29 2016 -0500
@@ -249,7 +249,7 @@
   assert(is_size_aligned(alignment_in_bytes, HeapWordSize),
          "Alignment size %u is incorrect.", alignment_in_bytes);
 
-  HeapWord* new_addr = (HeapWord*) align_pointer_up(addr, alignment_in_bytes);
+  HeapWord* new_addr = (HeapWord*) align_ptr_up(addr, alignment_in_bytes);
   size_t padding = pointer_delta(new_addr, addr);
 
   if (padding == 0) {