git.openwrt.org Git - openwrt/openwrt.git/blob

   1 From bb8bc7cf60d2c0b097c8b3b0e807f805b577a53f Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Joan=20Bruguera=20Mic=C3=B3?= <joanbrugueram@gmail.com>
   3 Date: Mon, 3 Jul 2023 00:46:02 +0000
   4 Subject: [PATCH] Move recent Linux version #ifdefs from v6.4 to v6.5
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 The latest commits, meant to fix the build on Linux 6.4, are actually
  10 fixing the build for API changes introduced in the merge window of the
  11 yet-unreleased Linux 6.5, and actually break the build for Linux 6.4.
  12
  13 In particular, the upstream commits introducing the API changes are the
  14 following, which are *not* included in the Linux v6.4 tag:
  15 * https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=19c4e618a1bc3d0cad1f04c857be8076cb05bbb2
  16 * https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca5e863233e8f6acd1792fd85d6bc2729a1b2c10
  17
  18 Change to #ifdef's to v6.5, where they will most likely be included.
  19
  20 Signed-off-by: Joan Bruguera Micó <joanbrugueram@gmail.com>
  21 ---
  22  ioctl.c | 4 ++--
  23  zc.c    | 2 +-
  24  2 files changed, 3 insertions(+), 3 deletions(-)
  25
  26 --- a/ioctl.c
  27 +++ b/ioctl.c
  28 @@ -1246,7 +1246,7 @@ static struct ctl_table verbosity_ctl_ro
  29         {
  30                 .procname       = "ioctl",
  31                 .mode           = 0555,
  32 -#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0))
  33 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 5, 0))
  34                 .child          = verbosity_ctl_dir,
  35  #endif
  36         },
  37 @@ -1269,7 +1269,7 @@ static int __init init_cryptodev(void)
  38                 return rc;
  39         }
  40
  41 -#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0))
  42 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 5, 0))
  43         verbosity_sysctl_header = register_sysctl_table(verbosity_ctl_root);
  44  #else
  45         verbosity_sysctl_header = register_sysctl(verbosity_ctl_root->procname, verbosity_ctl_dir);
  46 --- a/zc.c
  47 +++ b/zc.c
  48 @@ -80,7 +80,7 @@ int __get_userbuf(uint8_t __user *addr,
  49         ret = get_user_pages_remote(task, mm,
  50                         (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0,
  51                         pg, NULL, NULL);
  52 -#elif (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0))
  53 +#elif (LINUX_VERSION_CODE < KERNEL_VERSION(6, 5, 0))
  54         ret = get_user_pages_remote(mm,
  55                         (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0,
  56                         pg, NULL, NULL);