The patch titled
Make all drivers that use dma_declare_coherent_memory depend on it
has been added to the -mm tree. Its filename is
make-all-drivers-that-use-dma_declare_coherent_memory-depend-on-it.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: Make all drivers that use dma_declare_coherent_memory depend on it
From: Andi Kleen <ak@xxxxxxx>
There are two users of dma_declare_coherent_memory in tree. Make them
dependent on the architectures who actually implement that instead of falling
at runtime. All cases I checked fail fataly (no recovery) so these drivers
will never work on these architectures.
I'm also a little puzzled why x86-64 allyesconfig worked with CONFIG_MFD_SM501
without this patch anyways.
Signed-off-by: Andi Kleen <ak@xxxxxxx>
Cc: Jesper Nilsson <jesper.nilsson@xxxxxxxx>
Cc: Mikael Starvik <mikael.starvik@xxxxxxxx>
Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx>
Cc: Samuel Ortiz <samuel@xxxxxxxxxx>
Cc: Ben Dooks <ben-linux@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/cris/Kconfig | 5 +++++
arch/sh/Kconfig | 3 +++
arch/x86/Kconfig | 4 ++++
drivers/mfd/Kconfig | 1 +
drivers/scsi/Kconfig | 2 +-
5 files changed, 14 insertions(+), 1 deletion(-)
diff -puN arch/cris/Kconfig~make-all-drivers-that-use-dma_declare_coherent_memory-depend-on-it arch/cris/Kconfig
--- a/arch/cris/Kconfig~make-all-drivers-that-use-dma_declare_coherent_memory-depend-on-it
+++ a/arch/cris/Kconfig
@@ -47,6 +47,11 @@ config GENERIC_CALIBRATE_DELAY
config NO_IOPORT
def_bool y
+config HAS_DMA_DECLARE_COHERENT
+ # looks weird, but it really depends on that
+ depends on ETRAX_CARDBUS
+ def_bool y
+
config FORCE_MAX_ZONEORDER
int
default 6
diff -puN arch/sh/Kconfig~make-all-drivers-that-use-dma_declare_coherent_memory-depend-on-it arch/sh/Kconfig
--- a/arch/sh/Kconfig~make-all-drivers-that-use-dma_declare_coherent_memory-depend-on-it
+++ a/arch/sh/Kconfig
@@ -90,6 +90,9 @@ config ARCH_HAS_ILOG2_U64
config ARCH_NO_VIRT_TO_BUS
def_bool y
+config HAS_DMA_DECLARE_COHERENT
+ def_boot y
+
config ARCH_SUPPORTS_AOUT
def_bool y
diff -puN arch/x86/Kconfig~make-all-drivers-that-use-dma_declare_coherent_memory-depend-on-it arch/x86/Kconfig
--- a/arch/x86/Kconfig~make-all-drivers-that-use-dma_declare_coherent_memory-depend-on-it
+++ a/arch/x86/Kconfig
@@ -159,6 +159,10 @@ config GENERIC_PENDING_IRQ
depends on GENERIC_HARDIRQS && SMP
default y
+config HAS_DMA_DECLARE_COHERENT
+ def_bool y
+ depends on X86_32
+
config X86_SMP
bool
depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)
diff -puN drivers/mfd/Kconfig~make-all-drivers-that-use-dma_declare_coherent_memory-depend-on-it drivers/mfd/Kconfig
--- a/drivers/mfd/Kconfig~make-all-drivers-that-use-dma_declare_coherent_memory-depend-on-it
+++ a/drivers/mfd/Kconfig
@@ -7,6 +7,7 @@ menu "Multifunction device drivers"
config MFD_SM501
tristate "Support for Silicon Motion SM501"
+ depends on HAS_DMA_DECLARE_COHERENT
---help---
This is the core driver for the Silicon Motion SM501 multimedia
companion chip. This device is a multifunction device which may
diff -puN drivers/scsi/Kconfig~make-all-drivers-that-use-dma_declare_coherent_memory-depend-on-it drivers/scsi/Kconfig
--- a/drivers/scsi/Kconfig~make-all-drivers-that-use-dma_declare_coherent_memory-depend-on-it
+++ a/drivers/scsi/Kconfig
@@ -1173,7 +1173,7 @@ config SCSI_ZALON
config SCSI_NCR_Q720
tristate "NCR Quad 720 MCA SCSI support"
- depends on MCA && SCSI
+ depends on MCA && SCSI && HAS_DMA_DECLARE_COHERENT
select SCSI_SPI_ATTRS
help
This is a driver for the MicroChannel Quad 720 card produced by
_
Patches currently in -mm which might be from ak@xxxxxxx are
origin.patch
update-checkpatchpl-to-version-015.patch
git-x86.patch
bkl-removal-convert-cifs-over-to-unlocked_ioctl.patch
git-ocfs2.patch
git-xfs.patch
make-all-drivers-that-use-dma_declare_coherent_memory-depend-on-it.patch
init-move-setup-of-nr_cpu_ids-to-as-early-as-possible-v3.patch
generic-percpu-infrastructure-to-rebase-the-per-cpu-area-to-zero-v3.patch
x86_64-fold-pda-into-per-cpu-area-v3.patch
x86_64-fold-pda-into-per-cpu-area-v3-fix.patch
x86_64-cleanup-non-smp-usage-of-cpu-maps-v3.patch
profile-likely-unlikely-macros.patch
remove-dma_declare_coherent_memory-etc-from-cris.patch
remove-dmam_declarerelease_coherent_memory.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
