Remove cio_ignore functionality for s390x

We've backed this out on RHEL 5.3 for now because it was far more
complex than IBM had told us, so it's back to the drawing board
for this one.  Keeping rawhide in sync with what's happening on
the RHEL side with this feature.

3 files changed, 1 insertions, 26 deletions

diff --git a/bootdisk/s390x/generic.prm b/bootdisk/s390x/generic.prm
index e953ce2ff..e4687614e 100644
--- a/bootdisk/s390x/generic.prm
+++ b/bootdisk/s390x/generic.prm
@@ -1 +1 @@
-root=/dev/ram0 ro ip=off ramdisk_size=40000 cio_ignore=all,!0.0.0009
+root=/dev/ram0 ro ip=off ramdisk_size=40000
diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390
index 90c739f5a..08d575512 100644
--- a/loader/linuxrc.s390
+++ b/loader/linuxrc.s390
@@ -157,15 +157,6 @@ setupdevice()
       echo $"SUBCHANNELS or NETTYPE empty, cannot continue."
       exit 1
    fi
-
-   if [ -r /proc/cio_ignore ]; then
-      # enable subchannels
-      for subchannel in ${SUBCHANNELS//,/ } ; do
-          echo free $subchannel > /proc/cio_ignore
-          /sbin/chccwdev -e $subchannel
-      done
-   fi
-
    SYSDIR=${SUBCHANNELS//,*/}   # get first subchannel. This is where the device can be brought online
    sysecho /sys/bus/ccwgroup/drivers/${NETTYPE}/group "$SUBCHANNELS"
    if [ -n "$PORTNAME" ]; then
@@ -575,25 +566,10 @@ if [ -z "$DASD" ]; then
    read DASD
 fi
 if [ -n "$DASD" ]; then
-   # enable DASD devices
-   if [ -r /proc/cio_ignore ]; then
-      for dev in ${DASD//,/ } ; do
-          echo free $dev > /proc/cio_ignore
-          /sbin/chccwdev -e $dev
-      done
-   fi
-
    echo "DASD=$DASD" > /tmp/dasd_ports
 fi
 
 for i in ${!FCP_*}; do
-   # enable FCP devices
-   if [ -r /proc/cio_ignore ]; then
-      dev="$(echo ${!i} | cut -d ' ' -f 1)"
-      echo free $dev > /proc/cio_ignore
-      /sbin/chccwdev -e $dev
-   fi
-
    echo "${!i}" >> /tmp/fcpconfig
 done
 
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 8e43ac347..250ed080a 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -631,7 +631,6 @@ usr/bin/ldd
 usr/sbin/chroot
 usr/sbin/sshd
 usr/sbin/glibc_post_upgrade
-sbin/chccwdev
 sbin/cmsfslst
 sbin/cmsfscat
 sbin/busybox.anaconda