A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 13:49:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "soc: qcom: mem-buf: Fix compilation errors when hotplug is disabled"

Browse source
This commit is contained in:
qctecmdr 2020-06-03 12:43:49 -07:00 • committed by Gerrit - the friendly Code Review server
commit 058b018317
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
drivers/soc/qcom/mem-buf.c
View file

@ -964,6 +964,7 @@ static void mem_buf_unmap_mem_s2(struct mem_buf_desc *membuf)
kfree(membuf->sgl_desc);
}
#ifdef CONFIG_MEMORY_HOTPLUG
static int mem_buf_map_mem_s1(struct mem_buf_desc *membuf)
{
int i, ret;
@ -1001,7 +1002,14 @@ err_add_mem:
mem_hotplug_done();
return ret;
}
#else /* CONFIG_MEMORY_HOTPLUG */
static inline int mem_buf_map_mem_s1(struct mem_buf_desc *membuf)
{
return -EINVAL;
}
#endif /* CONFIG_MEMORY_HOTPLUG */
#ifdef CONFIG_MEMORY_HOTREMOVE
static void mem_buf_unmap_mem_s1(struct mem_buf_desc *membuf)
{
unsigned int i, nid;
@ -1019,6 +1027,11 @@ static void mem_buf_unmap_mem_s1(struct mem_buf_desc *membuf)
mem_hotplug_done();
}
#else /* CONFIG_MEMORY_HOTREMOVE */
static inline void mem_buf_unmap_mem_s1(struct mem_buf_desc *membuf)
{
}
#endif /* CONFIG_MEMORY_HOTREMOVE */
static int mem_buf_add_ion_mem(struct sg_table *sgt, void *dst_data)
{