]> git.baikalelectronics.ru Git - kernel.git/commit
Merge commit 'e111b0c68b' from rmk/fixes into cleanup/io-pci
authorArnd Bergmann <arnd@arndb.de>
Tue, 4 Sep 2012 13:01:37 +0000 (15:01 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 4 Sep 2012 13:01:37 +0000 (15:01 +0200)
commit3e4e33983e5c9057bf7b1e20b87795af751a5395
tree0e7789f83c0ba3a1bc3c19d3ccf5ea6f84f19db6
parentb86a0413fd9b92a74eca31a7b23948196f17b5ee
parente111b0c68bd032e4081c418a612dde296aa727f2
Merge commit 'e111b0c68b' from rmk/fixes into cleanup/io-pci

As Stephen Rothwell reports, e111b0c68bd0 ("ARM: Fix ioremap() of
address zero") from the arm-current tree and commit aa9d1d942ef6 ("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 e111b0c68bd0 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>
arch/arm/Kconfig
arch/arm/kernel/bios32.c
arch/arm/mach-dove/common.c
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-kirkwood/common.c
arch/arm/mach-tegra/pcie.c
arch/arm/mm/ioremap.c
arch/arm/mm/mmu.c