The patch titled
Subject: lib: move GENERIC_IOMAP to lib/Kconfig
has been removed from the -mm tree. Its filename was
lib-move-generic_iomap-to-lib-kconfig.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: "Michael S. Tsirkin" <mst@xxxxxxxxxx>
Subject: lib: move GENERIC_IOMAP to lib/Kconfig
Define GENERIC_IOMAP in a central location instead of all architectures.
This will be helpful for the follow-up patch which makes it select other
configs. Code is also a bit shorter this way.
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
Cc: Richard Henderson <rth@xxxxxxxxxxx>
Cc: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx>
Cc: Matt Turner <mattst88@xxxxxxxxx>
Cc: Russell King <linux@xxxxxxxxxxxxxxxx>
Cc: Mikael Starvik <starvik@xxxxxxxx>
Cc: Jesper Nilsson <jesper.nilsson@xxxxxxxx>
Cc: Richard Kuo <rkuo@xxxxxxxxxxxxxx>
Cc: Tony Luck <tony.luck@xxxxxxxxx>
Cc: Fenghua Yu <fenghua.yu@xxxxxxxxx>
Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Cc: Michal Simek <monstr@xxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Cc: Jonas Bonn <jonas@xxxxxxxxxxxx>
Cc: Kyle McMartin <kyle@xxxxxxxxxxx>
Cc: Helge Deller <deller@xxxxxx>
Cc: "James E.J. Bottomley" <jejb@xxxxxxxxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Chen Liqin <liqin.chen@xxxxxxxxxxxxx>
Cc: Lennox Wu <lennox.wu@xxxxxxxxx>
Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Guan Xuetao <gxt@xxxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: "Michael S. Tsirkin" <mst@xxxxxxxxxx>
Cc: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
Cc: Paul Bolle <pebolle@xxxxxxxxxx>
Cc: Olof Johansson <olof@xxxxxxxxx>
Cc: Rob Herring <rob.herring@xxxxxxxxxxx>
Cc: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Cc: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Cc: Michael Ellerman <michael@xxxxxxxxxxxxxx>
Cc: Fabio Baltieri <fabio.baltieri@xxxxxxxxx>
Cc: Lucas De Marchi <lucas.demarchi@xxxxxxxxxxxxxx>
Cc: "John W. Linville" <linville@xxxxxxxxxxxxx>
Cc: Lasse Collin <lasse.collin@xxxxxxxxxxx>
Cc: Arend van Spriel <arend@xxxxxxxxxxxx>
Cc: Franky Lin <frankyl@xxxxxxxxxxxx>
Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/alpha/Kconfig | 4 ----
arch/cris/Kconfig | 5 +----
arch/hexagon/Kconfig | 4 +---
arch/ia64/Kconfig | 5 +----
arch/m68k/Kconfig | 4 +---
arch/openrisc/Kconfig | 3 ---
arch/powerpc/platforms/Kconfig | 3 ---
arch/score/Kconfig | 4 +---
arch/sh/Kconfig | 3 ---
arch/unicore32/Kconfig | 4 +---
arch/x86/Kconfig | 4 +---
lib/Kconfig | 3 +++
12 files changed, 10 insertions(+), 36 deletions(-)
diff -puN arch/alpha/Kconfig~lib-move-generic_iomap-to-lib-kconfig arch/alpha/Kconfig
--- a/arch/alpha/Kconfig~lib-move-generic_iomap-to-lib-kconfig
+++ a/arch/alpha/Kconfig
@@ -70,10 +70,6 @@ config GENERIC_ISA_DMA
bool
default y
-config GENERIC_IOMAP
- bool
- default n
-
source "init/Kconfig"
source "kernel/Kconfig.freezer"
diff -puN arch/cris/Kconfig~lib-move-generic_iomap-to-lib-kconfig arch/cris/Kconfig
--- a/arch/cris/Kconfig~lib-move-generic_iomap-to-lib-kconfig
+++ a/arch/cris/Kconfig
@@ -19,10 +19,6 @@ config GENERIC_CMOS_UPDATE
config ARCH_USES_GETTIMEOFFSET
def_bool n
-config GENERIC_IOMAP
- bool
- default y
-
config ARCH_HAS_ILOG2_U32
bool
default n
@@ -52,6 +48,7 @@ config CRIS
select HAVE_IDE
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
+ select GENERIC_IOMAP
config HZ
int
diff -puN arch/hexagon/Kconfig~lib-move-generic_iomap-to-lib-kconfig arch/hexagon/Kconfig
--- a/arch/hexagon/Kconfig~lib-move-generic_iomap-to-lib-kconfig
+++ a/arch/hexagon/Kconfig
@@ -14,6 +14,7 @@ config HEXAGON
# select HAVE_CLK
# select IRQ_PER_CPU
# select GENERIC_PENDING_IRQ if SMP
+ select GENERIC_IOMAP
select HAVE_IRQ_WORK
select GENERIC_ATOMIC64
select HAVE_PERF_EVENTS
@@ -71,9 +72,6 @@ config GENERIC_CSUM
config GENERIC_IRQ_PROBE
def_bool y
-config GENERIC_IOMAP
- def_bool y
-
config NEED_SG_DMA_LENGTH
def_bool y
diff -puN arch/ia64/Kconfig~lib-move-generic_iomap-to-lib-kconfig arch/ia64/Kconfig
--- a/arch/ia64/Kconfig~lib-move-generic_iomap-to-lib-kconfig
+++ a/arch/ia64/Kconfig
@@ -29,6 +29,7 @@ config IA64
select GENERIC_IRQ_SHOW
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARCH_HAVE_NMI_SAFE_CMPXCHG
+ select GENERIC_IOMAP
default y
help
The Itanium Processor Family is Intel's 64-bit successor to
@@ -102,10 +103,6 @@ config EFI
bool
default y
-config GENERIC_IOMAP
- bool
- default y
-
config ARCH_CLOCKSOURCE_DATA
def_bool y
diff -puN arch/m68k/Kconfig~lib-move-generic_iomap-to-lib-kconfig arch/m68k/Kconfig
--- a/arch/m68k/Kconfig~lib-move-generic_iomap-to-lib-kconfig
+++ a/arch/m68k/Kconfig
@@ -37,9 +37,6 @@ config GENERIC_CALIBRATE_DELAY
bool
default y
-config GENERIC_IOMAP
- def_bool MMU
-
config GENERIC_CSUM
bool
@@ -78,6 +75,7 @@ source "kernel/Kconfig.freezer"
config MMU
bool "MMU-based Paged Memory Management Support"
default y
+ select GENERIC_IOMAP
help
Select if you want MMU-based virtualised addressing space
support by paged memory management. If unsure, say 'Y'.
diff -puN arch/openrisc/Kconfig~lib-move-generic_iomap-to-lib-kconfig arch/openrisc/Kconfig
--- a/arch/openrisc/Kconfig~lib-move-generic_iomap-to-lib-kconfig
+++ a/arch/openrisc/Kconfig
@@ -38,9 +38,6 @@ config RWSEM_XCHGADD_ALGORITHM
config GENERIC_HWEIGHT
def_bool y
-config GENERIC_IOMAP
- def_bool y
-
config NO_IOPORT
def_bool y
diff -puN arch/powerpc/platforms/Kconfig~lib-move-generic_iomap-to-lib-kconfig arch/powerpc/platforms/Kconfig
--- a/arch/powerpc/platforms/Kconfig~lib-move-generic_iomap-to-lib-kconfig
+++ a/arch/powerpc/platforms/Kconfig
@@ -175,9 +175,6 @@ config PPC_INDIRECT_MMIO
config PPC_IO_WORKAROUNDS
bool
-config GENERIC_IOMAP
- bool
-
source "drivers/cpufreq/Kconfig"
menu "CPU Frequency drivers"
diff -puN arch/score/Kconfig~lib-move-generic_iomap-to-lib-kconfig arch/score/Kconfig
--- a/arch/score/Kconfig~lib-move-generic_iomap-to-lib-kconfig
+++ a/arch/score/Kconfig
@@ -4,6 +4,7 @@ config SCORE
def_bool y
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
+ select GENERIC_IOMAP
choice
prompt "System type"
@@ -33,9 +34,6 @@ endmenu
config CPU_SCORE7
bool
-config GENERIC_IOMAP
- def_bool y
-
config NO_DMA
bool
default y
diff -puN arch/sh/Kconfig~lib-move-generic_iomap-to-lib-kconfig arch/sh/Kconfig
--- a/arch/sh/Kconfig~lib-move-generic_iomap-to-lib-kconfig
+++ a/arch/sh/Kconfig
@@ -84,9 +84,6 @@ config GENERIC_GPIO
config GENERIC_CALIBRATE_DELAY
bool
-config GENERIC_IOMAP
- bool
-
config GENERIC_CLOCKEVENTS
def_bool y
diff -puN arch/unicore32/Kconfig~lib-move-generic_iomap-to-lib-kconfig arch/unicore32/Kconfig
--- a/arch/unicore32/Kconfig~lib-move-generic_iomap-to-lib-kconfig
+++ a/arch/unicore32/Kconfig
@@ -12,6 +12,7 @@ config UNICORE32
select GENERIC_IRQ_PROBE
select GENERIC_IRQ_SHOW
select ARCH_WANT_FRAME_POINTERS
+ select GENERIC_IOMAP
help
UniCore-32 is 32-bit Instruction Set Architecture,
including a series of low-power-consumption RISC chip
@@ -30,9 +31,6 @@ config GENERIC_CLOCKEVENTS
config GENERIC_CSUM
def_bool y
-config GENERIC_IOMAP
- def_bool y
-
config NO_IOPORT
bool
diff -puN arch/x86/Kconfig~lib-move-generic_iomap-to-lib-kconfig arch/x86/Kconfig
--- a/arch/x86/Kconfig~lib-move-generic_iomap-to-lib-kconfig
+++ a/arch/x86/Kconfig
@@ -43,6 +43,7 @@ config X86
select HAVE_KVM
select HAVE_ARCH_KGDB
select HAVE_ARCH_TRACEHOOK
+ select GENERIC_IOMAP
select HAVE_GENERIC_DMA_COHERENT if X86_32
select HAVE_EFFICIENT_UNALIGNED_ACCESS
select USER_STACKTRACE_SUPPORT
@@ -144,9 +145,6 @@ config NEED_SG_DMA_LENGTH
config GENERIC_ISA_DMA
def_bool ISA_DMA_API
-config GENERIC_IOMAP
- def_bool y
-
config GENERIC_BUG
def_bool y
depends on BUG
diff -puN lib/Kconfig~lib-move-generic_iomap-to-lib-kconfig lib/Kconfig
--- a/lib/Kconfig~lib-move-generic_iomap-to-lib-kconfig
+++ a/lib/Kconfig
@@ -19,6 +19,9 @@ config RATIONAL
config GENERIC_FIND_FIRST_BIT
bool
+config GENERIC_IOMAP
+ bool
+
config CRC_CCITT
tristate "CRC-CCITT functions"
help
_
Patches currently in -mm which might be from mst@xxxxxxxxxx are
linux-next.patch
lib-add-generic_pci_iomap-v2.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
