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 S932525AbcBIPIW (ORCPT <rfc822;w@1wt.eu>);
	Tue, 9 Feb 2016 10:08:22 -0500
Received: from mout.kundenserver.de ([217.72.192.75]:61842 "EHLO
	mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755012AbcBIPIS (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 9 Feb 2016 10:08:18 -0500
From: Arnd Bergmann <arnd@arndb.de>
To: Mark Rutland <mark.rutland@arm.com>
Cc: 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>
Subject: Re: linux-next: Tree for Feb 9
Date: Tue, 09 Feb 2016 16:08:03 +0100
Message-ID: <3561538.HMPaSbaoce@wuerfel>
User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; )
In-Reply-To: <20160209143554.GA9332@leverpostej>
References: <20160209164104.4ecaa0ce@canb.auug.org.au> <CAMuHMdWLk10EovfQdyVodpw98_MiNOgGBxpVO-WPXShdvff94g@mail.gmail.com> <20160209143554.GA9332@leverpostej>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Provags-ID: V03:K0:8pVtgW+nW4YB2D759eKQDwHfbWmkOhuE1HXG4ueJEcnlLKSluN7
 ztxpZ57yAHyGsHqVI+7Wm53RdszBUSS3YaLKu8iFhVymvZZv9TVS52pf1uAjRKlwrhTbPeb
 i21h3sPdhv/480cU4tK12fJdkJfuReOjXG8EqgUFhVhDCTNfjHgKKxZ1xplOlAQ1+CTvUB2
 nRXzi8ejxTYLDbRlfJOPA==
X-UI-Out-Filterresults: notjunk:1;V01:K0:U19AD7EaXYw=:Jb8SsULipfGkCFZdT78OuV
 JL9rEABIDupMCm4YvZGBtVH2NIqKBOUdBGJe2ywfJxU20nPVRayviQHYSIzUSl0W80Mbk2bvg
 HvVpPpNjwkpOaGnUZ0nR/0J7CZhlHU5x6H5Mcacz1K2gGsuYbayU1paTsS07c4ljoGBezolpl
 WDjHuh42UkGSv3fBwYxzvmFquon6R4vEOeIOoICMcoi6YITedDmerrQS+atEOWQRlI6Vmv2WX
 mgkoBCBOTMjiVzDbNtb3/tLdyn4O+r2ekBL0vUIZVB4Y8X/cA9WwMnJJv1yolGbPCZQ5oR5ys
 kUCza03uM57ryZ77Gl5F4HybcJ1nASRrWdC+gWhEaBoGtHertiH//LCZ/2jcuq1R7sn34wxE/
 moARg+NPQ0EMXEgui+DagqXzlPGxUjA7UuKjWdEnAEgO4iHabITGRWLld06zPREBM0kMGy0rj
 pEwd/EixLZHX8B/gc8iDv8SDglVdpB/565r3Q9pxBfAG6UEHLQw7d8kT0A+u2zhcWR88kLBLV
 SGadQbeiKMGkL/8pyXbXnOP+sh9afGL8KkEbG2FOLaK43UrZi3F+RWrvvZv0g/axqbPLjqolj
 9Bwkf5Z2mJRaKD6rmWqI0vXooVzaFHvFqzf5F5kEVhbUdngYEedQGT0Fu9tLKrTIy1z8/D4mq
 RM2h9Jj4ZqQPzwSABaYAj11dBWJcTvtjrBnF51Fxa7eDXPiM58owtKOVr5lk+QmhbMKcFFeCH
 5/6qq8+rUJEByJX5
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 14:35:54 Mark Rutland wrote:
> diff --git a/include/asm-generic/fixmap.h b/include/asm-generic/fixmap.h
> index f9c27b6..e5255ff 100644
> --- a/include/asm-generic/fixmap.h
> +++ b/include/asm-generic/fixmap.h
> @@ -69,6 +69,8 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr)
>         __set_fixmap(idx, 0, FIXMAP_PAGE_CLEAR)
>  #endif
>  
> +void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot);
> +
>  /* Return a pointer with offset calculated */
>  static inline unsigned long __set_fixmap_offset(enum fixed_addresses idx,
>                                                 phys_addr_t phys,
> 


I think there is a conflicting declaration in arch/x86/include/asm/paravirt.h:

static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
                                phys_addr_t phys, pgprot_t flags)
{
        pv_mmu_ops.set_fixmap(idx, phys, flags);
}

Can you test on x86 with CONFIG_PARAVIRT set?

	Arnd