From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754913AbcBIQqV (ORCPT <rfc822;w@1wt.eu>);
	Tue, 9 Feb 2016 11:46:21 -0500
Received: from mout.kundenserver.de ([212.227.126.130]:50302 "EHLO
	mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751197AbcBIQqT (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 9 Feb 2016 11:46:19 -0500
From: Arnd Bergmann <arnd@arndb.de>
To: Mark Rutland <mark.rutland@arm.com>
Cc: kbuild test robot <lkp@intel.com>, kbuild-all@01.org,
        Geert Uytterhoeven <geert@linux-m68k.org>,
        Catalin Marinas <catalin.marinas@arm.com>,
        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, 09 Feb 2016 17:45:53 +0100
Message-ID: <2887622.W3XSflQVAL@wuerfel>
User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; )
In-Reply-To: <20160209163333.GA22110@leverpostej>
References: <20160209143554.GA9332@leverpostej> <201602100053.LjML6D6b%fengguang.wu@intel.com> <20160209163333.GA22110@leverpostej>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Provags-ID: V03:K0:2t+FWdzDjAbZrsubiEIfMrfJIzq8PdsrHX3LyXV/CcpoNdNl8hF
 sagTcLtAR3PDRPt8T01m37BsLQCwo2S6iZapSAe8L1zP89hi7581YrORH6r0S2YyTN4biw6
 IbusOjQW7HQ9L664q3rszIDrfqiVmhxFTqQt+qY9g1D0aLY6CSgpBcq2TmtF3zKKpYROyov
 e2a9X7syrTIxFYUxbyntg==
X-UI-Out-Filterresults: notjunk:1;V01:K0:xnF7xd71wOA=:Q+J9T3EnQ6Z/1sxEI4Wrmu
 0P787d0BTHUl4r+Kf0+716ISmTeiPtgWtp8d/W9WgYwIKV+erRVpKpzqLNdQkC87nI28WIeHz
 Yc6Tyb58olMsXGfO/frkJQwHUEzSIAaE9/kFWHGYcpSuemqQxDVdnTDHG96Gc6d7kLAo+U62b
 6oWLHnX2Vt4X+TxIPjCq7fbfm+JZ4SasKBbEp8gjfjF5Pfby2sRr9Lkjt7N5bMPBjYW79OOoi
 nvVvM//39ddmzQHWGzliEScQP4zrElwcKjv657M0fFgDokMboDS3M94n2FqJL00EaxSTNMeRy
 NK3b52aJJziUYufPYtxD555UiKxWVdstEutqHQYTICPV9KVzPbQgOLD8wf9v/qqL3zz9fd1su
 YSHle5KlK47tcVDNfhlaQCrP1jtKyHyiu4dyPzccv3/nudVn57dJ5s4QIvwZOaJdY5sFTcR3J
 RiRAIlGpOmSX1DONGFwxG5k55XGWfkuYnOb7tDKKsNrglFugigo//U42LJQ0e2eS9PeYSHwoX
 FNAKH1TwziTZ7uH6PHNdL9IOKEEl9fvF45eq3nTfLQyGrVmcMrHcAHETTtO5CGvzrTApriLlV
 2wYDaYHu8gS5JFnOl8oWU7aM81CyWEIiuOJHEHj4UsG2nvy/mJIL4IDKwI3Z+hbw/fd+wPKK3
 IVPsDmtqGsMsX9mwcszpCO9HItQubwQ0wzAZK4cYi5zISc23YGMVwusoz2QPLOnX5z4lCcAb5
 S/wlDH6qAEXhBWtL
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tuesday 09 February 2016 16:33:34 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.
> 
> 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?
> 

I'd vote for using phys_addr_t in arch/um.

	Arnd