linux-next: Tree for 2nd December

linux-next: Tree for 2nd December

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1431 bytes --]

Hi all,

Changes since 20151127:

The block and gpio trees gained build failures so I used the versions
from next-20151127.

There were quite a lot of new conflicts from Arnd's arm multiplatform
series which I fixed up, plus a few other new conflicts from other
sources.

I messed up using Stephen's scripts so only the akpm-current tree was
merged of Andrew Morton's trees.  Sorry about that, it's gone 1am so I'm
not about to try to fix anything up.

I will run a build again tomorrow (Thursday 3rd).  I *may* also do one
on Friday but it will have less build coverage and may not appear till
Saturday if I do.

Non-merge commits (relative to Linus' tree): 3399
 5261 files changed, 719667 insertions(+), 620445 deletions(-)

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
If you are tracking the linux-next tree using git, you should not use
"git pull" to do so as that will try to merge the new linux-next release
with the old one.  You should use "git fetch" and checkout or reset to
the new master.

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log
files in the Next directory.  Between each merge, the tree was built
with a defconfig for arm64 and an allmodconfig for x86_64, a
multi_v7_defconfig for arm and a native build of tools/perf.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

[PATCH] of: fix build failure

[Sudip Mukherjee]

We are having build failure with next-20151202 for sparc allmodconfig
with the error messages:
undefined reference to 'of_io_request_and_map'

CONFIG_OF is defined for sparc so it is expected that we have a
definition of of_io_request_and_map() but of/address.c is only compiled
if it is !SPARC.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---

build log is at:
https://travis-ci.org/sudipm-mukherjee/parport/builds/94541627

patch has been build tested with sparc allmodconfig and x86_64
allmodconfig.

 include/linux/of_address.h | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index 507daad..7bf4603 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -112,8 +112,6 @@ static inline bool of_dma_is_coherent(struct device_node *np)
 extern int of_address_to_resource(struct device_node *dev, int index,
 				  struct resource *r);
 void __iomem *of_iomap(struct device_node *node, int index);
-void __iomem *of_io_request_and_map(struct device_node *device,
-					int index, const char *name);
 #else
 
 #include <linux/io.h>
@@ -136,6 +134,19 @@ static inline void __iomem *of_io_request_and_map(struct device_node *device,
 }
 #endif
 
+#if defined(CONFIG_OF) && !defined(CONFIG_SPARC)
+void __iomem *of_io_request_and_map(struct device_node *device,
+					int index, const char *name);
+#else
+#include <linux/io.h>
+
+static inline void __iomem *of_io_request_and_map(struct device_node *device,
+					int index, const char *name)
+{
+	return IOMEM_ERR_PTR(-EINVAL);
+}
+#endif /* CONFIG_OF && !CONFIG_SPARC */
+
 #if defined(CONFIG_OF_ADDRESS) && defined(CONFIG_PCI)
 extern const __be32 *of_get_pci_address(struct device_node *dev, int bar_no,
 			       u64 *size, unsigned int *flags);
-- 
1.9.1

Re: [PATCH] of: fix build failure

[Geert Uytterhoeven]

Hi Sudip

On Thu, Dec 3, 2015 at 9:38 AM, Sudip Mukherjee
<sudipm.mukherjee@gmail.com> wrote:
> We are having build failure with next-20151202 for sparc allmodconfig
> with the error messages:
> undefined reference to 'of_io_request_and_map'
>
> CONFIG_OF is defined for sparc so it is expected that we have a
> definition of of_io_request_and_map() but of/address.c is only compiled
> if it is !SPARC.

No, it's compiled depending on CONFIG_OF_ADDRESS...

> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> ---
>
> build log is at:
> https://travis-ci.org/sudipm-mukherjee/parport/builds/94541627
>
> patch has been build tested with sparc allmodconfig and x86_64
> allmodconfig.
>
>  include/linux/of_address.h | 15 +++++++++++++--
>  1 file changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/of_address.h b/include/linux/of_address.h
> index 507daad..7bf4603 100644
> --- a/include/linux/of_address.h
> +++ b/include/linux/of_address.h
> @@ -112,8 +112,6 @@ static inline bool of_dma_is_coherent(struct device_node *np)
>  extern int of_address_to_resource(struct device_node *dev, int index,
>                                   struct resource *r);
>  void __iomem *of_iomap(struct device_node *node, int index);
> -void __iomem *of_io_request_and_map(struct device_node *device,
> -                                       int index, const char *name);
>  #else
>
>  #include <linux/io.h>
> @@ -136,6 +134,19 @@ static inline void __iomem *of_io_request_and_map(struct device_node *device,
>  }
>  #endif
>
> +#if defined(CONFIG_OF) && !defined(CONFIG_SPARC)

... hence wouldn't it be better to use "#ifdef CONFIG_OF_ADDRESS" instead?

> +void __iomem *of_io_request_and_map(struct device_node *device,
> +                                       int index, const char *name);
> +#else
> +#include <linux/io.h>
> +
> +static inline void __iomem *of_io_request_and_map(struct device_node *device,
> +                                       int index, const char *name)
> +{
> +       return IOMEM_ERR_PTR(-EINVAL);
> +}
> +#endif /* CONFIG_OF && !CONFIG_SPARC */
> +

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] of: fix build failure

[Sudip Mukherjee]

On Sat, Dec 05, 2015 at 12:09:41PM +0100, Geert Uytterhoeven wrote:
> Hi Sudip
> 
> On Thu, Dec 3, 2015 at 9:38 AM, Sudip Mukherjee
> <sudipm.mukherjee@gmail.com> wrote:
> > We are having build failure with next-20151202 for sparc allmodconfig
> > with the error messages:
> > undefined reference to 'of_io_request_and_map'
> >
> > CONFIG_OF is defined for sparc so it is expected that we have a
> > definition of of_io_request_and_map() but of/address.c is only compiled
> > if it is !SPARC.
> 
> No, it's compiled depending on CONFIG_OF_ADDRESS...

yes, ofcourse. I did it looking at:
config OF_ADDRESS
def_bool y
depends on !SPARC && HAS_IOMEM
> 
> > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> > ---
<snip>
> > +#if defined(CONFIG_OF) && !defined(CONFIG_SPARC)
> 
> ... hence wouldn't it be better to use "#ifdef CONFIG_OF_ADDRESS" instead?
> 
I will test with today's next and send v2.

regards
sudip