[PATCH] mm: m68k kill stram swap

Please, please now delete the Atari CONFIG_STRAM_SWAP code.  It may be
excellent and ingenious code, but its reference to swap_vfsmnt betrays that it
hasn't been built since 2.5.1 (four years old come December), it's delving
deep into matters which are the preserve of core mm code, its only purpose is
to give the more conscientious mm guys an anxiety attack from time to time;
yet we keep on breaking it more and more.

If you want to use RAM for swap, then if the MTD driver does not already
provide just what you need, I'm sure David could be persuaded to add the
extra.  But you'd also like to be able to allocate extents of that swap for
other use: we can give you a core interface for that if you need.  But unbuilt
for four years suggests to me that there's no need at all.

I cannot swear the patch below won't break your build, but believe so.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 1 insertions, 23 deletions

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index ba960bbc8e6d..1dd5d18b2201 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -388,33 +388,11 @@ config AMIGA_PCMCIA
           Include support in the kernel for pcmcia on Amiga 1200 and Amiga
           600. If you intend to use pcmcia cards say Y; otherwise say N.
 
-config STRAM_SWAP
-        bool "Support for ST-RAM as swap space"
-        depends on ATARI && BROKEN
-        ---help---
-          Some Atari 68k machines (including the 520STF and 1020STE) divide
-          their addressable memory into ST and TT sections.  The TT section
-          (up to 512MB) is the main memory; the ST section (up to 4MB) is
-          accessible to the built-in graphics board, runs slower, and is
-          present mainly for backward compatibility with older machines.
-
-          This enables support for using (parts of) ST-RAM as swap space,
-          instead of as normal system memory. This can first enhance system
-          performance if you have lots of alternate RAM (compared to the size
-          of ST-RAM), because executable code always will reside in faster
-          memory. ST-RAM will remain as ultra-fast swap space. On the other
-          hand, it allows much improved dynamic allocations of ST-RAM buffers
-          for device driver modules (e.g. floppy, ACSI, SLM printer, DMA
-          sound). The probability that such allocations at module load time
-          fail is drastically reduced.
-
 config STRAM_PROC
         bool "ST-RAM statistics in /proc"
         depends on ATARI
         help
-          Say Y here to report ST-RAM usage statistics in /proc/stram.  See
-          the help for CONFIG_STRAM_SWAP for discussion of ST-RAM and its
-          uses.
+          Say Y here to report ST-RAM usage statistics in /proc/stram.
 
 config HEARTBEAT
         bool "Use power LED as a heartbeat" if AMIGA || APOLLO || ATARI || MAC ||Q40