2 files changed, 20 insertions, 2 deletions

diff --git a/arch/s390/kernel/compat_ioctl.c b/arch/s390/kernel/compat_ioctl.c
index da473bda962f..432aeb38b50d 100644
--- a/arch/s390/kernel/compat_ioctl.c
+++ b/arch/s390/kernel/compat_ioctl.c
@@ -63,8 +63,6 @@ COMPATIBLE_IOCTL(BIODASDSATTR)
 COMPATIBLE_IOCTL(BIODASDCMFENABLE)
 COMPATIBLE_IOCTL(BIODASDCMFDISABLE)
 COMPATIBLE_IOCTL(BIODASDREADALLCMB)
-
-COMPATIBLE_IOCTL(TAPE390_DISPLAY)
 };
 
 int ioctl_table_size = ARRAY_SIZE(ioctl_start);
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index 86262a13f7c6..5ce7ca38ace0 100644
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -37,6 +37,8 @@ static int tapechar_open(struct inode *,struct file *);
 static int tapechar_release(struct inode *,struct file *);
 static int tapechar_ioctl(struct inode *, struct file *, unsigned int,
                           unsigned long);
+static long tapechar_compat_ioctl(struct file *, unsigned int,
+                          unsigned long);
 
 static struct file_operations tape_fops =
 {
@@ -44,6 +46,7 @@ static struct file_operations tape_fops =
         .read = tapechar_read,
         .write = tapechar_write,
         .ioctl = tapechar_ioctl,
+        .compat_ioctl = tapechar_compat_ioctl,
         .open = tapechar_open,
         .release = tapechar_release,
 };
@@ -463,6 +466,23 @@ tapechar_ioctl(struct inode *inp, struct file *filp,
         return device->discipline->ioctl_fn(device, no, data);
 }
 
+static long
+tapechar_compat_ioctl(struct file *filp, unsigned int no, unsigned long data)
+{
+        struct tape_device *device = filp->private_data;
+        int rval = -ENOIOCTLCMD;
+
+        if (device->discipline->ioctl_fn) {
+                lock_kernel();
+                rval = device->discipline->ioctl_fn(device, no, data);
+                unlock_kernel();
+                if (rval == -EINVAL)
+                        rval = -ENOIOCTLCMD;
+        }
+
+        return rval;
+}
+
 /*
  * Initialize character device frontend.
  */