From: Catalin Marinas <catalin.marinas@arm.com>
To: Mark Rutland <mark.rutland@arm.com>
Cc: kbuild test robot <lkp@intel.com>,
kbuild-all@01.org, Geert Uytterhoeven <geert@linux-m68k.org>,
Arnd Bergmann <arnd@arndb.de>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Linux-Next <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Jeremy Linton <jeremy.linton@arm.com>,
Linux-Arch <linux-arch@vger.kernel.org>,
Laura Abbott <labbott@fedoraproject.org>,
Jeff Dike <jdike@addtoit.com>,
Richard Weinberger <richard@nod.at>
Subject: Re: [PATCH] asm-generic: Fix build when __set_fixmap is absent
Date: Tue, 9 Feb 2016 16:52:34 +0000 [thread overview]
Message-ID: <20160209165234.GI16122@e104818-lin.cambridge.arm.com> (raw)
In-Reply-To: <20160209163333.GA22110@leverpostej>
On Tue, Feb 09, 2016 at 04:33:34PM +0000, Mark Rutland wrote:
> > >> include/asm-generic/fixmap.h:72:6: error: conflicting types for '__set_fixmap'
> > void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot);
> > ^
> > In file included from arch/um/include/asm/pgtable.h:11:0,
> > from include/linux/mm.h:67,
> > from include/linux/ring_buffer.h:5,
> > from include/linux/trace_events.h:5,
> > from include/trace/syscall.h:6,
> > from include/linux/syscalls.h:81,
> > from init/main.c:18:
> > arch/um/include/asm/fixmap.h:39:13: note: previous declaration of '__set_fixmap' was here
> > extern void __set_fixmap (enum fixed_addresses idx,
> > ^
>
> The conflict is the type of 'phys'. In arch/um that's an unsigned long
> rather than a phys_addr_t as it is elsewhere.
At a quick grep, we also have:
arch/sh/include/asm/fixmap.h
arch/sh/mm/init.c
arch/sh/mm/nommu.c
> If I convert that to a phys_addr_t the build goes along happily.
>
> Should we change set_fixmap_offset back to a macro function for now, or
> is it simple/correct to change arch/um to use phys_addr_t in
> __set_fixmap?
And sh. I prefer the static inline, though there is more effort needed
to test and get acks ;) (I really don't mind either way).
--
Catalin
next prev parent reply other threads:[~2016-02-09 16:52 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-09 5:41 linux-next: Tree for Feb 9 Stephen Rothwell
2016-02-09 7:34 ` Sudip Mukherjee
2016-02-09 12:00 ` Mark Rutland
2016-02-09 12:00 ` Mark Rutland
2016-02-09 12:00 ` Mark Rutland
2016-02-09 13:48 ` Geert Uytterhoeven
2016-02-09 14:35 ` Mark Rutland
2016-02-09 14:35 ` Mark Rutland
2016-02-09 14:35 ` Mark Rutland
2016-02-09 14:38 ` Catalin Marinas
2016-02-09 15:08 ` Arnd Bergmann
2016-02-09 16:01 ` Mark Rutland
2016-02-09 16:08 ` Arnd Bergmann
2016-02-09 16:13 ` [PATCH] asm-generic: Fix build when __set_fixmap is absent kbuild test robot
2016-02-09 16:33 ` Mark Rutland
2016-02-09 16:45 ` Arnd Bergmann
2016-02-09 16:52 ` Catalin Marinas [this message]
2016-02-09 17:21 ` Mark Rutland
2016-02-09 17:21 ` Mark Rutland
2016-02-09 17:21 ` Mark Rutland
2016-02-09 17:27 ` Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160209165234.GI16122@e104818-lin.cambridge.arm.com \
--to=catalin.marinas@arm.com \
--cc=ard.biesheuvel@linaro.org \
--cc=arnd@arndb.de \
--cc=geert@linux-m68k.org \
--cc=jdike@addtoit.com \
--cc=jeremy.linton@arm.com \
--cc=kbuild-all@01.org \
--cc=labbott@fedoraproject.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lkp@intel.com \
--cc=mark.rutland@arm.com \
--cc=richard@nod.at \
--cc=sfr@canb.auug.org.au \
--cc=sudipm.mukherjee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.