2 files changed, 19 insertions, 7 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 732b1fa48cf2..3e57a7502e86 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -138,19 +138,25 @@ Who:	Mauro Carvalho Chehab <mchehab@infradead.org>
 ---------------------------
 
 What:   PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])
-When:   November 2005
+When:   2.6.35/2.6.36
 Files:  drivers/pcmcia/: pcmcia_ioctl.c
 Why:    With the 16-bit PCMCIA subsystem now behaving (almost) like a
         normal hotpluggable bus, and with it using the default kernel
         infrastructure (hotplug, driver core, sysfs) keeping the PCMCIA
         control ioctl needed by cardmgr and cardctl from pcmcia-cs is
-        unnecessary, and makes further cleanups and integration of the
+        unnecessary and potentially harmful (it does not provide for
+        proper locking), and makes further cleanups and integration of the
         PCMCIA subsystem into the Linux kernel device driver model more
         difficult. The features provided by cardmgr and cardctl are either
         handled by the kernel itself now or are available in the new
         pcmciautils package available at
         http://kernel.org/pub/linux/utils/kernel/pcmcia/
-Who:    Dominik Brodowski <linux@brodo.de>
+
+        For all architectures except ARM, the associated config symbol
+        has been removed from kernel 2.6.34; for ARM, it will be likely
+        be removed from kernel 2.6.35. The actual code will then likely
+        be removed from kernel 2.6.36.
+Who:    Dominik Brodowski <linux@dominikbrodowski.net>
 
 ---------------------------
 
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 0a6601c76809..d189e4743e69 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -51,17 +51,23 @@ config PCMCIA_LOAD_CIS
 
 config PCMCIA_IOCTL
         bool "PCMCIA control ioctl (obsolete)"
-        depends on PCMCIA
+        depends on PCMCIA && ARM && !SMP && !PREEMPT
         default y
         help
           If you say Y here, the deprecated ioctl interface to the PCMCIA
-          subsystem will be built. It is needed by cardmgr and cardctl
-          (pcmcia-cs) to function properly.
+          subsystem will be built. It is needed by the deprecated pcmcia-cs
+          tools (cardmgr, cardctl) to function properly.
 
           You should use the new pcmciautils package instead (see
           <file:Documentation/Changes> for location and details).
 
-          If unsure, say Y.
+          This config option will most likely be removed from kernel 2.6.35,
+          the associated code from kernel 2.6.36.
+
+          As the PCMCIA ioctl is not locking safe, it depends on !SMP and
+          !PREEMPT.
+
+          If unsure, say N.
 
 config CARDBUS
         bool "32-bit CardBus support"