* [PATCH] drivers: of: fix build break if asm/dma-contiguous.h is missing
@ 2013-09-10 9:13 Marek Szyprowski
2013-09-10 13:39 ` Guenter Roeck
2013-09-10 19:45 ` Rob Herring
0 siblings, 2 replies; 5+ messages in thread
From: Marek Szyprowski @ 2013-09-10 9:13 UTC (permalink / raw)
To: linux-kernel, linaro-mm-sig, devicetree
Cc: Marek Szyprowski, Kyungmin Park, Arnd Bergmann, Michal Nazarewicz,
Grant Likely, Tomasz Figa, Sylwester Nawrocki, Sascha Hauer,
Laura Abbott, Rob Herring, Olof Johansson, Pawel Moll,
Mark Rutland, Stephen Warren, Ian Campbell, Tomasz Figa,
Kumar Gala, Nishanth Peethambaran, Marc, Guenter Roeck
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>
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] drivers: of: fix build break if asm/dma-contiguous.h is missing
2013-09-10 9:13 [PATCH] drivers: of: fix build break if asm/dma-contiguous.h is missing Marek Szyprowski
@ 2013-09-10 13:39 ` Guenter Roeck
2013-09-10 19:45 ` Rob Herring
1 sibling, 0 replies; 5+ messages in thread
From: Guenter Roeck @ 2013-09-10 13:39 UTC (permalink / raw)
To: Marek Szyprowski
Cc: linux-kernel, linaro-mm-sig, devicetree, Kyungmin Park,
Arnd Bergmann, Michal Nazarewicz, Grant Likely, Tomasz Figa,
Sylwester Nawrocki, Sascha Hauer, Laura Abbott, Rob Herring,
Olof Johansson, Pawel Moll, Mark Rutland, Stephen Warren,
Ian Campbell, Tomasz Figa, Kumar Gala, Nishanth Peethambaran,
Marc
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>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drivers: of: fix build break if asm/dma-contiguous.h is missing
2013-09-10 9:13 [PATCH] drivers: of: fix build break if asm/dma-contiguous.h is missing Marek Szyprowski
2013-09-10 13:39 ` Guenter Roeck
@ 2013-09-10 19:45 ` Rob Herring
2013-09-11 6:31 ` Marek Szyprowski
1 sibling, 1 reply; 5+ messages in thread
From: Rob Herring @ 2013-09-10 19:45 UTC (permalink / raw)
To: Marek Szyprowski
Cc: linux-kernel, linaro-mm-sig, devicetree, Kyungmin Park,
Arnd Bergmann, Michal Nazarewicz, Grant Likely, Tomasz Figa,
Sylwester Nawrocki, Sascha Hauer, Laura Abbott, Olof Johansson,
Pawel Moll, Mark Rutland, Stephen Warren, Ian Campbell,
Tomasz Figa, Kumar Gala, Nishanth Peethambaran, Marc,
Guenter Roeck
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>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drivers: of: fix build break if asm/dma-contiguous.h is missing
2013-09-10 19:45 ` Rob Herring
@ 2013-09-11 6:31 ` Marek Szyprowski
2013-09-11 15:35 ` Guenter Roeck
0 siblings, 1 reply; 5+ messages in thread
From: Marek Szyprowski @ 2013-09-11 6:31 UTC (permalink / raw)
To: Rob Herring
Cc: linux-kernel, linaro-mm-sig, devicetree, Kyungmin Park,
Arnd Bergmann, Michal Nazarewicz, Grant Likely, Tomasz Figa,
Sylwester Nawrocki, Sascha Hauer, Laura Abbott, Olof Johansson,
Pawel Moll, Mark Rutland, Stephen Warren, Ian Campbell,
Tomasz Figa, Kumar Gala, Nishanth Peethambaran, Marc,
Guenter Roeck
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
--
Marek Szyprowski
Samsung R&D Institute Poland
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drivers: of: fix build break if asm/dma-contiguous.h is missing
2013-09-11 6:31 ` Marek Szyprowski
@ 2013-09-11 15:35 ` Guenter Roeck
0 siblings, 0 replies; 5+ messages in thread
From: Guenter Roeck @ 2013-09-11 15:35 UTC (permalink / raw)
To: Marek Szyprowski
Cc: Rob Herring, linux-kernel, linaro-mm-sig, devicetree,
Kyungmin Park, Arnd Bergmann, Michal Nazarewicz, Grant Likely,
Tomasz Figa, Sylwester Nawrocki, Sascha Hauer, Laura Abbott,
Olof Johansson, Pawel Moll, Mark Rutland, Stephen Warren,
Ian Campbell, Tomasz Figa, Kumar Gala, Nishanth Peethambaran,
Marc
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
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-09-11 15:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-10 9:13 [PATCH] drivers: of: fix build break if asm/dma-contiguous.h is missing Marek Szyprowski
2013-09-10 13:39 ` Guenter Roeck
2013-09-10 19:45 ` Rob Herring
2013-09-11 6:31 ` Marek Szyprowski
2013-09-11 15:35 ` Guenter Roeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).