From: "Michael S. Tsirkin" <mst@redhat.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
Arnd Bergmann <arnd@arndb.de>,
Jesse Barnes <jbarnes@virtuousgeek.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [GIT PULL] use generic pci_iomap on all architectures
Date: Thu, 5 Jan 2012 16:58:36 +0200 [thread overview]
Message-ID: <20120105145836.GA2751@redhat.com> (raw)
Linus, please pull the following changes for 3.3, thanks a lot!
These changes have been on linux-next for a while now.
They touch a lot of arches and have interdependencies, so merging
separately seems to make sense, I think.
The following changes since commit 805a6af8dba5dfdd35ec35dc52ec0122400b2610:
Linux 3.2 (2012-01-04 15:55:44 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git for-linus
for you to fetch changes up to 193a667fba76b3df482cbf865228e26ee246e889:
alpha: drop pci_iomap/pci_iounmap from pci-noop.c (2011-12-04 16:00:19 +0200)
----------------------------------------------------------------
lib: use generic pci_iomap on all architectures
Many architectures don't want to pull in iomap.c,
so they ended up duplicating pci_iomap from that file.
That function isn't trivial, and we are going to modify it
https://lkml.org/lkml/2011/11/14/183
so the duplication hurts.
This reduces the scope of the problem significantly,
by moving pci_iomap to a separate file and
referencing that from all architectures.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
----------------------------------------------------------------
Michael S. Tsirkin (16):
lib: move GENERIC_IOMAP to lib/Kconfig
lib: add GENERIC_PCI_IOMAP
alpha: switch to GENERIC_PCI_IOMAP
arm: switch to GENERIC_PCI_IOMAP
microblaze: switch to GENERIC_PCI_IOMAP
mips: switch to GENERIC_PCI_IOMAP
parisc: switch to GENERIC_PCI_IOMAP
powerpc: switch to GENERIC_PCI_IOMAP
sh: switch to GENERIC_PCI_IOMAP
sparc: switch to GENERIC_PCI_IOMAP
tile: don't panic on iomap
tile: switch to GENERIC_PCI_IOMAP
frv: switch to GENERIC_PCI_IOMAP
mn10300: add missing __iomap markers
mn10300: switch to GENERIC_PCI_IOMAP
alpha: drop pci_iomap/pci_iounmap from pci-noop.c
arch/alpha/Kconfig | 5 +---
arch/alpha/kernel/pci-noop.c | 12 --------
arch/alpha/kernel/pci.c | 26 +-----------------
arch/arm/Kconfig | 1 +
arch/arm/include/asm/io.h | 2 +-
arch/arm/mm/iomap.c | 21 --------------
arch/cris/Kconfig | 5 +---
arch/frv/Kconfig | 1 +
arch/frv/include/asm/io.h | 2 +-
arch/frv/mb93090-mb00/Makefile | 2 +-
arch/frv/mb93090-mb00/pci-iomap.c | 29 --------------------
arch/hexagon/Kconfig | 4 +--
arch/ia64/Kconfig | 5 +---
arch/m68k/Kconfig | 4 +--
arch/microblaze/Kconfig | 1 +
arch/microblaze/pci/iomap.c | 19 -------------
arch/mips/Kconfig | 1 +
arch/mips/lib/iomap-pci.c | 26 ------------------
arch/mn10300/Kconfig | 1 +
arch/mn10300/include/asm/io.h | 17 +++++------
arch/mn10300/unit-asb2305/Makefile | 2 +-
arch/mn10300/unit-asb2305/pci-iomap.c | 31 ---------------------
arch/openrisc/Kconfig | 3 --
arch/parisc/Kconfig | 1 +
arch/parisc/lib/iomap.c | 23 ---------------
arch/powerpc/Kconfig | 1 +
arch/powerpc/kernel/iomap.c | 19 -------------
arch/powerpc/platforms/Kconfig | 3 --
arch/score/Kconfig | 4 +--
arch/sh/Kconfig | 4 +--
arch/sh/drivers/pci/pci.c | 23 ---------------
arch/sparc/Kconfig | 1 +
arch/sparc/include/asm/io_32.h | 2 +-
arch/sparc/include/asm/io_64.h | 2 +-
arch/sparc/lib/iomap.c | 23 ---------------
arch/tile/Kconfig | 1 +
arch/tile/include/asm/io.h | 3 +-
arch/tile/include/asm/pci.h | 2 +-
arch/tile/kernel/pci.c | 21 --------------
arch/unicore32/Kconfig | 4 +--
arch/x86/Kconfig | 4 +--
include/asm-generic/io.h | 4 +-
include/asm-generic/iomap.h | 9 ++----
include/asm-generic/pci_iomap.h | 25 +++++++++++++++++
lib/Kconfig | 7 +++++
lib/Makefile | 1 +
lib/iomap.c | 38 +------------------------
lib/pci_iomap.c | 48 +++++++++++++++++++++++++++++++++
48 files changed, 124 insertions(+), 369 deletions(-)
delete mode 100644 arch/frv/mb93090-mb00/pci-iomap.c
delete mode 100644 arch/mn10300/unit-asb2305/pci-iomap.c
create mode 100644 include/asm-generic/pci_iomap.h
create mode 100644 lib/pci_iomap.c
next reply other threads:[~2012-01-05 14:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-05 14:58 Michael S. Tsirkin [this message]
2012-01-05 21:31 ` [GIT PULL] use generic pci_iomap on all architectures Stephen Rothwell
2012-01-05 21:39 ` Stephen Rothwell
2012-01-05 21:47 ` Stephen Rothwell
2012-01-05 23:04 ` Geert Uytterhoeven
2012-01-11 1:51 ` Linus Torvalds
2012-01-11 2:38 ` Junio C Hamano
2012-01-11 2:52 ` Linus Torvalds
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=20120105145836.GA2751@redhat.com \
--to=mst@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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.