The patch titled
Subject: common: dma-mapping: Protect remapping functions with CONFIG_MMU
has been added to the -mm tree. Its filename is
common-dma-mapping-introduce-common-remapping-functions-fix-2.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/common-dma-mapping-introduce-common-remapping-functions-fix-2.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/common-dma-mapping-introduce-common-remapping-functions-fix-2.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Laura Abbott <lauraa@xxxxxxxxxxxxxx>
Subject: common: dma-mapping: Protect remapping functions with CONFIG_MMU
The dma remapping functions use vmalloc features which are
not defined for CONFIG_MMU=n
drivers/built-in.o: In function `dma_common_pages_remap':
drivers/base/dma-mapping.c:311: undefined reference to `get_vm_area_caller'
drivers/base/dma-mapping.c:315: undefined reference to `map_vm_area'
drivers/built-in.o: In function `dma_common_free_remap':
drivers/base/dma-mapping.c:328: undefined reference to `find_vm_area'
These functions aren't applicable for nommu targets so protect them
with #ifdef CONFIG_MMU
Signed-off-by: Laura Abbott <lauraa@xxxxxxxxxxxxxx>
Reported-by: kbuild test robot <fengguang.wu@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/base/dma-mapping.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN drivers/base/dma-mapping.c~common-dma-mapping-introduce-common-remapping-functions-fix-2 drivers/base/dma-mapping.c
--- a/drivers/base/dma-mapping.c~common-dma-mapping-introduce-common-remapping-functions-fix-2
+++ a/drivers/base/dma-mapping.c
@@ -270,6 +270,7 @@ int dma_common_mmap(struct device *dev,
}
EXPORT_SYMBOL(dma_common_mmap);
+#ifdef CONFIG_MMU
/*
* remaps an array of PAGE_SIZE pages into another vm_area
* Cannot be used in non-sleeping contexts
@@ -335,3 +336,4 @@ void dma_common_free_remap(void *cpu_add
unmap_kernel_range((unsigned long)cpu_addr, size);
vunmap(cpu_addr);
}
+#endif
_
Patches currently in -mm which might be from lauraa@xxxxxxxxxxxxxx are
lib-genallocc-add-power-aligned-algorithm.patch
lib-genallocc-add-genpool-range-check-function.patch
common-dma-mapping-introduce-common-remapping-functions.patch
common-dma-mapping-introduce-common-remapping-functions-fix.patch
common-dma-mapping-introduce-common-remapping-functions-fix-2.patch
arm-use-genalloc-for-the-atomic-pool.patch
arm64-add-atomic-pool-for-non-coherent-and-cma-allocations.patch
debugging-keep-track-of-page-owners.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
