From 0e321f45c1085a196137e1c6f006b67b82dbb829 Mon Sep 17 00:00:00 2001
From: Alex Xie <AlexBin.Xie@amd.com>
Date: Wed, 27 Oct 2021 12:51:08 -0400
Subject: [PATCH] SWDEV-305752 - OCL WIN Conformance select test fail

Change-Id: I73571c262a14d6b27d8cf91b6d1a13e1974ddc96
---
 rocclr/device/device.hpp        | 10 ++++++++++
 rocclr/device/pal/palmemory.hpp | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/rocclr/device/device.hpp b/rocclr/device/device.hpp
index b6d9aefde2..bfcb18d81f 100644
--- a/rocclr/device/device.hpp
+++ b/rocclr/device/device.hpp
@@ -734,6 +734,16 @@ class Memory : public amd::HeapObject {
     return NULL;
   }
 
+  bool isPersistentMapped() const { return (flags_ & PersistentMap) ? true : false; }
+  void setPersistentMapFlag(bool persistentMapped) {
+    if (persistentMapped == true) {
+      flags_ |= PersistentMap;
+    }
+    else {
+      flags_ &= ~PersistentMap;
+    }
+  }
+
   virtual bool pinSystemMemory(void* hostPtr,  //!< System memory address
                                size_t size     //!< Size of allocated system memory
   ) {
diff --git a/rocclr/device/pal/palmemory.hpp b/rocclr/device/pal/palmemory.hpp
index 0c1cbd46a6..bc49c0f65a 100644
--- a/rocclr/device/pal/palmemory.hpp
+++ b/rocclr/device/pal/palmemory.hpp
@@ -97,16 +97,6 @@ class Memory : public device::Memory, public Resource {
                                size_t* slicePitch = NULL    //!< Slice for the mapped memory
   );
 
-  virtual bool isPersistentMapped() const { return (flags_ & PersistentMap) ? true : false; }
-  virtual void setPersistentMapFlag(bool persistentMapped) {
-    if (persistentMapped == true) {
-      flags_ |= PersistentMap;
-    }
-    else {
-      flags_ &= ~PersistentMap;
-    }
-  }
-
   //! Pins system memory associated with this memory object
   virtual bool pinSystemMemory(void* hostPtr,  //!< System memory address
                                size_t size     //!< Size of allocated system memory