Skip to content
This repository was archived by the owner on Dec 24, 2024. It is now read-only.

Commit 22fd9e4

Browse files
ypapadop-amdmakslevental
authored andcommitted
rocr/aie: Fix merge conflict
1 parent 0cd4a26 commit 22fd9e4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

runtime/hsa-runtime/core/driver/xdna/amd_xdna_driver.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ XdnaDriver::AllocateMemory(const core::MemoryRegion &mem_region,
168168
/// TODO: For now we always map the memory and keep a mapping from handles
169169
/// to VA memory addresses. Once we can support the separate VMEM call to
170170
/// map handles we can fix this.
171-
if (m_region.kernarg()) {
171+
if (region.kernarg()) {
172172
mapped_mem = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd_,
173173
get_bo_info_args.map_offset);
174174
if (mapped_mem == MAP_FAILED) {

0 commit comments

Comments
 (0)