All of lore.kernel.org
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <3561538.HMPaSbaoce@wuerfel> (raw)
In-Reply-To: <20160209143554.GA9332@leverpostej>

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

  parent reply	other threads:[~2016-02-09 15:08 UTC|newest]

Thread overview: 29+ 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 [this message]
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
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
  -- strict thread matches above, loose matches on Subject: below --
2024-02-09  5:09 linux-next: Tree for Feb 9 Stephen Rothwell
2023-02-09  3:49 Stephen Rothwell
2022-02-09  5:52 Stephen Rothwell
2021-02-09 11:28 Stephen Rothwell
2018-02-09  2:54 Stephen Rothwell
2017-02-09  6:28 Stephen Rothwell
2015-02-09 10:18 Stephen Rothwell
2012-02-09  5:04 Stephen Rothwell

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=3561538.HMPaSbaoce@wuerfel \
    --to=arnd@arndb.de \
    --cc=ard.biesheuvel@linaro.org \
    --cc=catalin.marinas@arm.com \
    --cc=geert@linux-m68k.org \
    --cc=jeremy.linton@arm.com \
    --cc=labbott@fedoraproject.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --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.