diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-07 23:32:24 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-07 23:32:24 +0100 |
| commit | 95025d6b27721ae8bbce592403fdc06e982204c8 (patch) | |
| tree | 04cdc095c1d1b41406ebaf6c5d3639f4d27b3f38 /kernel/tsacct.c | |
| parent | ACPI: remove duplicated lines of merging problems with acpi_processor_add (diff) | |
| parent | sh: use the the PCI channels's io_map_base (diff) | |
| download | linux-95025d6b27721ae8bbce592403fdc06e982204c8.tar.xz linux-95025d6b27721ae8bbce592403fdc06e982204c8.zip | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
arch: fix ioport mapping on mips,sh
Kevin Cernekee reported that recent cleanup that replaced pci_iomap with
a generic function failed to take into account the differences in io
port handling on mips and sh architectures.
Rather than revert the changes reintroducing the code duplication, this
patchset fixes this by adding ability for architectures to override
ioport mapping for pci devices.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
sh: use the the PCI channels's io_map_base
mips: use the the PCI controller's io_map_base
lib: add NO_GENERIC_PCI_IOPORT_MAP
Diffstat (limited to 'kernel/tsacct.c')
0 files changed, 0 insertions, 0 deletions