linux

iv/linux

History

Arnd Bergmann 863e99a8c1 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>

2012-09-04 15:01:37 +02:00

include/mach

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

2012-09-04 15:01:37 +02:00

common.h

ARM: restart: integrator: use new restart hook

2012-01-05 12:57:13 +00:00

core.c

ARM: integrator: include <linux/export.h>

2012-08-09 15:16:44 +02:00

cpu.c

ARM: integrator: fix compile warning in cpu.c