*** old/src/share/vm/gc_implementation/shared/parGCAllocBuffer.inline.hpp	Fri Apr  3 11:29:38 2015
--- new/src/share/vm/gc_implementation/shared/plab.inline.hpp	Fri Apr  3 11:29:38 2015

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2014, 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.

*** 20,36 ****
--- 20,36 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_PARGCALLOCBUFFER_INLINE_HPP
! #define SHARE_VM_GC_IMPLEMENTATION_SHARED_PARGCALLOCBUFFER_INLINE_HPP
! #ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_PLAB_INLINE_HPP
! #define SHARE_VM_GC_IMPLEMENTATION_SHARED_PLAB_INLINE_HPP
  
! #include "gc_implementation/shared/parGCAllocBuffer.hpp"
! #include "gc_implementation/shared/plab.hpp"
  #include "gc_interface/collectedHeap.inline.hpp"
  
! HeapWord* ParGCAllocBuffer::allocate_aligned(size_t word_sz, unsigned short alignment_in_bytes) {
! HeapWord* PLAB::allocate_aligned(size_t word_sz, unsigned short alignment_in_bytes) {
  
    HeapWord* res = CollectedHeap::align_allocation_or_fail(_top, _end, alignment_in_bytes);
    if (res == NULL) {
      return NULL;
    }

*** 39,44 ****
--- 39,44 ----
    // can be used below.
    _top = res;
    return allocate(word_sz);
  }
  
! #endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_PARGCALLOCBUFFER_INLINE_HPP
! #endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_PLAB_INLINE_HPP