libs/dahdi-linux/patches/141-Remove-support-for-32-bit-userspace-with-64-bit-kern.patch

   1 From 4df746fe3ffd6678f36b16c9b0750fa552da92e4 Mon Sep 17 00:00:00 2001
   2 From: Shaun Ruffell <sruffell@sruffell.net>
   3 Date: Mon, 16 Nov 2020 22:01:21 -0600
   4 Subject: [PATCH 09/12] Remove support for 32-bit userspace with 64-bit kernel
   5
   6 I am not aware of anyone who tests in this configuration, and I'm not
   7 sure if it currently works. I'll remove any support for the time being
   8 and can add it back in if someone comes forward needing support for it.
   9
  10 Signed-off-by: Shaun Ruffell <sruffell@sruffell.net>
  11 ---
  12  drivers/dahdi/dahdi-base.c | 34 ----------------------------------
  13  1 file changed, 34 deletions(-)
  14
  15 --- a/drivers/dahdi/dahdi-base.c
  16 +++ b/drivers/dahdi/dahdi-base.c
  17 @@ -7019,17 +7019,6 @@ static int dahdi_ioctl(struct inode *ino
  18  }
  19  #endif
  20
  21 -#ifdef HAVE_COMPAT_IOCTL
  22 -static long dahdi_ioctl_compat(struct file *file, unsigned int cmd,
  23 -               unsigned long data)
  24 -{
  25 -       if (cmd == DAHDI_SFCONFIG)
  26 -               return -ENOTTY; /* Not supported yet */
  27 -
  28 -       return dahdi_unlocked_ioctl(file, cmd, data);
  29 -}
  30 -#endif
  31 -
  32  /**
  33   * _get_next_channo - Return the next taken channel number from the span list.
  34   * @span:      The span with which to start the search.
  35 @@ -10285,9 +10274,6 @@ static const struct file_operations dahd
  36         .release = dahdi_release,
  37  #ifdef HAVE_UNLOCKED_IOCTL
  38         .unlocked_ioctl  = dahdi_unlocked_ioctl,
  39 -#ifdef HAVE_COMPAT_IOCTL
  40 -       .compat_ioctl = dahdi_ioctl_compat,
  41 -#endif
  42  #else
  43         .ioctl   = dahdi_ioctl,
  44  #endif
  45 @@ -10301,9 +10287,6 @@ static const struct file_operations dahd
  46         .release = dahdi_timer_release,
  47  #ifdef HAVE_UNLOCKED_IOCTL
  48         .unlocked_ioctl  = dahdi_timer_unlocked_ioctl,
  49 -#ifdef HAVE_COMPAT_IOCTL
  50 -       .compat_ioctl = dahdi_timer_unlocked_ioctl,
  51 -#endif
  52  #else
  53         .ioctl   = dahdi_timer_ioctl,
  54  #endif
  55 @@ -10377,24 +10360,10 @@ static int nodev_ioctl(struct inode *ino
  56  }
  57  #endif
  58
  59 -#ifdef HAVE_COMPAT_IOCTL
  60 -static long nodev_ioctl_compat(struct file *file, unsigned int cmd,
  61 -               unsigned long data)
  62 -{
  63 -       if (cmd == DAHDI_SFCONFIG)
  64 -               return -ENOTTY; /* Not supported yet */
  65 -
  66 -       return nodev_unlocked_ioctl(file, cmd, data);
  67 -}
  68 -#endif
  69 -
  70  static const struct file_operations nodev_fops = {
  71         .owner   = THIS_MODULE,
  72  #ifdef HAVE_UNLOCKED_IOCTL
  73         .unlocked_ioctl  = nodev_unlocked_ioctl,
  74 -#ifdef HAVE_COMPAT_IOCTL
  75 -       .compat_ioctl = nodev_ioctl_compat,
  76 -#endif
  77  #else
  78         .ioctl   = nodev_ioctl,
  79  #endif
  80 @@ -10409,9 +10378,6 @@ static const struct file_operations dahd
  81         .release = dahdi_release,
  82  #ifdef HAVE_UNLOCKED_IOCTL
  83         .unlocked_ioctl  = dahdi_unlocked_ioctl,
  84 -#ifdef HAVE_COMPAT_IOCTL
  85 -       .compat_ioctl = dahdi_ioctl_compat,
  86 -#endif
  87  #else
  88         .ioctl   = dahdi_ioctl,
  89  #endif