It is not needed to include asm/dma-contiguous.h header to compile reserved memory initialization code, so remove it to avoid build break on architectures without CMA support.
Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com --- drivers/of/of_reserved_mem.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index a754b84..0fe40c7 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -11,8 +11,6 @@ * License or (at your optional) any later version of the license. */
-#include <asm/dma-contiguous.h> - #include <linux/memblock.h> #include <linux/err.h> #include <linux/of.h>
On 09/10/2013 02:13 AM, Marek Szyprowski wrote:
It is not needed to include asm/dma-contiguous.h header to compile reserved memory initialization code, so remove it to avoid build break on architectures without CMA support.
Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com
Tested-by: Guenter Roeck linux@roeck-us.net
drivers/of/of_reserved_mem.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index a754b84..0fe40c7 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -11,8 +11,6 @@
- License or (at your optional) any later version of the license.
*/
-#include <asm/dma-contiguous.h>
- #include <linux/memblock.h> #include <linux/err.h> #include <linux/of.h>
On 09/10/2013 04:13 AM, Marek Szyprowski wrote:
It is not needed to include asm/dma-contiguous.h header to compile reserved memory initialization code, so remove it to avoid build break on architectures without CMA support.
Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com
Acked-by: Rob Herring rob.herring@calxeda.com
I can apply this or it can go with other CMA stuff.
Aren't there also some comments from Grant to address as well?
Rob
drivers/of/of_reserved_mem.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index a754b84..0fe40c7 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -11,8 +11,6 @@
- License or (at your optional) any later version of the license.
*/ -#include <asm/dma-contiguous.h>
#include <linux/memblock.h> #include <linux/err.h> #include <linux/of.h>
Hello,
On 9/10/2013 9:45 PM, Rob Herring wrote:
On 09/10/2013 04:13 AM, Marek Szyprowski wrote:
It is not needed to include asm/dma-contiguous.h header to compile reserved memory initialization code, so remove it to avoid build break on architectures without CMA support.
Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com
Acked-by: Rob Herring rob.herring@calxeda.com
I can apply this or it can go with other CMA stuff.
I think it will be best if I push it to Linus asap to fix the build break on arm64 and mips, introduced by my pull request. It is really strange that I got no report from linux-next about that issue, although this patch was there for about 2 weeks.
Aren't there also some comments from Grant to address as well?
Right, I'm working on providing an update which will address the issues pointed by Grant, but I got sick and had to take some days off. I still didn't recover completely, but I hope I will manage to finish them by the end of the week.
Best regards
On Wed, Sep 11, 2013 at 08:31:54AM +0200, Marek Szyprowski wrote:
Hello,
On 9/10/2013 9:45 PM, Rob Herring wrote:
On 09/10/2013 04:13 AM, Marek Szyprowski wrote:
It is not needed to include asm/dma-contiguous.h header to compile reserved memory initialization code, so remove it to avoid build break on architectures without CMA support.
Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com
Acked-by: Rob Herring rob.herring@calxeda.com
I can apply this or it can go with other CMA stuff.
I think it will be best if I push it to Linus asap to fix the build break on arm64 and mips, introduced by my pull request. It is really strange that I got no report from linux-next about that issue, although this patch was there for about 2 weeks.
If you refer to the the kisskb builds, arm64 is not on its build list. The cavium_octeon build error does show up: http://kisskb.ellerman.id.au/kisskb/buildresult/9483218/
The error is also seen in mips:nlm_xlp_defconfig, which is part of my build set but not on kisskb (just don't ask me why I added it ;).
Guenter
Aren't there also some comments from Grant to address as well?
Right, I'm working on providing an update which will address the issues pointed by Grant, but I got sick and had to take some days off. I still didn't recover completely, but I hope I will manage to finish them by the end of the week.
Best regards
Marek Szyprowski Samsung R&D Institute Poland
linaro-mm-sig@lists.linaro.org
-
Guenter Roeck -
Marek Szyprowski -
Rob Herring