From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 4 Sep 2012 13:01:37 +0000 (+0200)
Subject: Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci
X-Git-Tag: omap-cleanup-local-headers-for-v3.7~45^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=863e99a8c1ea2b0391491904297f57a0f6a1fdd6;p=pandora-kernel.git

Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci

As Stephen Rothwell reports, 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 conflict in
a nontrivial way in arch/arm/mm/mmu.c.

Rob Herring explains:
The PCI i/o reserved area has a dummy physical address of 0 and
needs to be skipped by ioremap searches. So we don't set
VM_ARM_STATIC_MAPPING to prevent matches by ioremap. The vm_struct
settings don't really matter when we do the real mapping of the
i/o space.

Since commit a849088aa155 is at the start of the fixes branch
in the arm tree, we can merge it into the branch that contains
the other ioremap changes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
---

863e99a8c1ea2b0391491904297f57a0f6a1fdd6
Reading git-diff-tree failed