--- a/hotspot/src/share/vm/gc/parallel/cardTableExtension.cpp	Wed Apr 12 13:05:59 2017 +0200
+++ b/hotspot/src/share/vm/gc/parallel/cardTableExtension.cpp	Wed Apr 12 17:53:18 2017 +0200
@@ -504,9 +504,7 @@
   }
 #ifdef ASSERT
   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
-  assert(cur_committed.start() ==
-    (HeapWord*) align_size_up((uintptr_t) cur_committed.start(),
-                              os::vm_page_size()),
+  assert(cur_committed.start() == align_ptr_up(cur_committed.start(), os::vm_page_size()),
     "Starts should have proper alignment");
 #endif
 
@@ -586,8 +584,7 @@
   jbyte* new_start = byte_for(new_region.start());
   // Set the new start of the committed region
   HeapWord* new_start_aligned =
-    (HeapWord*)align_size_down((uintptr_t)new_start,
-                             os::vm_page_size());
+    (HeapWord*)align_ptr_down(new_start, os::vm_page_size());
   MemRegion new_committed = MemRegion(new_start_aligned,
     _committed[changed_region].end());
   _committed[changed_region] = new_committed;