Skip to content

Commit 0c25676

Browse files
committed
Merge: Enable CONFIG_DMA_NUMA_CMA for aarch64 and x86_64
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/19 JIRA: https://issues.redhat.com/browse/RHEL-59621 Upstream status: RHEL-only Signed-off-by: Chris von Recklinghausen <crecklin@redhat.com> Approved-by: Rafael Aquini <raquini@redhat.com> Approved-by: Jerry Snitselaar <jsnitsel@redhat.com> Approved-by: David Hildenbrand <david@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Jan Stancek <jstancek@redhat.com>
2 parents f36875b + a98f918 commit 0c25676

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

kernel/dma/contiguous.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ static inline __maybe_unused phys_addr_t cma_early_percent_memory(void)
159159
static void __init dma_numa_cma_reserve(void)
160160
{
161161
int nid;
162+
unsigned int tech_preview = 0;
162163

163164
for_each_node(nid) {
164165
int ret;
@@ -180,6 +181,7 @@ static void __init dma_numa_cma_reserve(void)
180181
if (ret)
181182
pr_warn("%s: reservation failed: err %d, node %d", __func__,
182183
ret, nid);
184+
tech_preview += 1;
183185
}
184186

185187
if (numa_cma_size[nid]) {
@@ -191,8 +193,11 @@ static void __init dma_numa_cma_reserve(void)
191193
if (ret)
192194
pr_warn("%s: reservation failed: err %d, node %d", __func__,
193195
ret, nid);
196+
tech_preview += 1;
194197
}
195198
}
199+
if (tech_preview)
200+
mark_tech_preview("dma-numa-cma-reserve", NULL);
196201
}
197202
#else
198203
static inline void __init dma_numa_cma_reserve(void)

0 commit comments

Comments
 (0)