From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Rob Herring <rob.herring@calxeda.com>,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm-current tree
Date: Tue, 4 Sep 2012 08:08:24 +0000 [thread overview]
Message-ID: <201209040808.25103.arnd@arndb.de> (raw)
In-Reply-To: <20120904160626.f1dcb67ebbb145053c49da8c@canb.auug.org.au>
On Tuesday 04 September 2012, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mm/mmu.c between commit a849088aa155 ("ARM: Fix ioremap() of
> address zero") from the arm-current tree and commit c2794437091a ("ARM:
> Add fixed PCI i/o mapping") from the arm-soc tree.
>
> I am not sure how to fix this, so I have used the arm-current version of
> the change to pmd_empty_section_gap() since that changed the vm->flags.
> It may be that just changing the vm->flags value in vm_reserve_area_early()
> would be ok?
If I read this correctly, we want pci_reserve_io to use VM_ARM_STATIC_MAPPING
while pmd_empty_section_gap should use VM_ARM_EMPTY_MAPPING, so we probably
want to add a flag argument to the vm_reserve_area_early() function.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the arm-current tree
Date: Tue, 4 Sep 2012 08:08:24 +0000 [thread overview]
Message-ID: <201209040808.25103.arnd@arndb.de> (raw)
In-Reply-To: <20120904160626.f1dcb67ebbb145053c49da8c@canb.auug.org.au>
On Tuesday 04 September 2012, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mm/mmu.c between commit a849088aa155 ("ARM: Fix ioremap() of
> address zero") from the arm-current tree and commit c2794437091a ("ARM:
> Add fixed PCI i/o mapping") from the arm-soc tree.
>
> I am not sure how to fix this, so I have used the arm-current version of
> the change to pmd_empty_section_gap() since that changed the vm->flags.
> It may be that just changing the vm->flags value in vm_reserve_area_early()
> would be ok?
If I read this correctly, we want pci_reserve_io to use VM_ARM_STATIC_MAPPING
while pmd_empty_section_gap should use VM_ARM_EMPTY_MAPPING, so we probably
want to add a flag argument to the vm_reserve_area_early() function.
Arnd
next prev parent reply other threads:[~2012-09-04 8:08 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-04 6:06 linux-next: manual merge of the arm-soc tree with the arm-current tree Stephen Rothwell
2012-09-04 6:06 ` Stephen Rothwell
2012-09-04 6:06 ` Stephen Rothwell
2012-09-04 8:08 ` Arnd Bergmann [this message]
2012-09-04 8:08 ` Arnd Bergmann
2012-09-04 9:01 ` Russell King - ARM Linux
2012-09-04 9:01 ` Russell King - ARM Linux
2012-09-04 12:44 ` Rob Herring
2012-09-04 12:44 ` Rob Herring
2012-09-04 13:03 ` Stephen Rothwell
2012-09-04 13:03 ` Stephen Rothwell
2012-09-04 13:03 ` Stephen Rothwell
2012-09-04 13:11 ` Arnd Bergmann
2012-09-04 13:11 ` Arnd Bergmann
2012-09-04 13:19 ` Stephen Rothwell
2012-09-04 13:19 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2013-04-11 6:21 Stephen Rothwell
2013-04-11 6:21 ` Stephen Rothwell
2013-04-11 6:21 ` Stephen Rothwell
2015-01-29 22:58 Stephen Rothwell
2015-01-29 22:58 ` Stephen Rothwell
2015-01-29 22:58 ` 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=201209040808.25103.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=rmk@arm.linux.org.uk \
--cc=rob.herring@calxeda.com \
--cc=sfr@canb.auug.org.au \
/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.