Merge pull request #5055 from jason-hall/metronome13

Modify GlobalAllocationManagerRealtime for moving to OMR
eclipse-openj9 · Mar 11, 2019 · 7f093b5 · 7f093b5
2 parents 914d634 + d5727a5
commit 7f093b5
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/runtime/gc_realtime/GlobalAllocationManagerRealtime.cpp b/runtime/gc_realtime/GlobalAllocationManagerRealtime.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 1991, 2014 IBM Corp. and others
+ * Copyright (c) 1991, 2019 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -20,19 +20,14 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
  *******************************************************************************/
 
-#include "j9port.h"
-#include "ModronAssertions.h"
-
 #include "AllocationContextRealtime.hpp"
-#include "EnvironmentRealtime.hpp"
-#include "GCExtensions.hpp"
 
 #include "GlobalAllocationManagerRealtime.hpp"
 
 MM_GlobalAllocationManagerRealtime *
 MM_GlobalAllocationManagerRealtime::newInstance(MM_EnvironmentBase *env, MM_RegionPoolSegregated *regionPool)
 {
-	MM_GlobalAllocationManagerRealtime *allocationManager = (MM_GlobalAllocationManagerRealtime *)env->getForge()->allocate(sizeof(MM_GlobalAllocationManagerSegregated), MM_AllocationCategory::FIXED, J9_GET_CALLSITE());
+	MM_GlobalAllocationManagerRealtime *allocationManager = (MM_GlobalAllocationManagerRealtime *)env->getForge()->allocate(sizeof(MM_GlobalAllocationManagerSegregated), MM_AllocationCategory::FIXED, OMR_GET_CALLSITE());
 	if (allocationManager) {
 		allocationManager = new(allocationManager) MM_GlobalAllocationManagerRealtime(env);
 		if (!allocationManager->initialize(env, regionPool)) {