diff mbox series

[2/6] Update kernel version to 6.5 in header constant tests

Message ID 20231030213245.2626895-3-adhemerval.zanella@linaro.org
State Superseded
Headers show
Series Update from Linux 6.6 | expand

Commit Message

Adhemerval Zanella Oct. 30, 2023, 9:32 p.m. UTC 
---
 sysdeps/unix/sysv/linux/tst-mman-consts.py  | 2 +-
 sysdeps/unix/sysv/linux/tst-mount-consts.py | 4 ++--
 sysdeps/unix/sysv/linux/tst-pidfd-consts.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

Comments

Joseph Myers Oct. 30, 2023, 9:45 p.m. UTC | #1 
6.6 not 6.5 in the commit summary.

How was this tested?  I note that in Linux 6.6, 
arch/x86/include/uapi/asm/mman.h adds a definition of MAP_ABOVE4G, but 
this patch series doesn't seem to add a corresponding definition to glibc; 
if that doesn't cause a failure of tst-mman-consts.py, why not?
Adhemerval Zanella Oct. 31, 2023, 12:01 p.m. UTC | #2 
On 30/10/23 18:45, Joseph Myers wrote:
> 6.6 not 6.5 in the commit summary.
> 
> How was this tested?  I note that in Linux 6.6, 
> arch/x86/include/uapi/asm/mman.h adds a definition of MAP_ABOVE4G, but 
> this patch series doesn't seem to add a corresponding definition to glibc; 
> if that doesn't cause a failure of tst-mman-consts.py, why not?
> 

I see now that x86_64 showed a tst-mman-consts.py failure that I has not
caught for some reason.  I will update the patch.
diff mbox series

Patch

diff --git a/sysdeps/unix/sysv/linux/tst-mman-consts.py b/sysdeps/unix/sysv/linux/tst-mman-consts.py
index e85ea41ee4..8186d7e178 100644
--- a/sysdeps/unix/sysv/linux/tst-mman-consts.py
+++ b/sysdeps/unix/sysv/linux/tst-mman-consts.py
@@ -33,7 +33,7 @@  def main():
                         help='C compiler (including options) to use')
     args = parser.parse_args()
     linux_version_headers = glibcsyscalls.linux_kernel_version(args.cc)
-    linux_version_glibc = (6, 5)
+    linux_version_glibc = (6, 6)
     sys.exit(glibcextract.compare_macro_consts(
         '#define _GNU_SOURCE 1\n'
         '#include <sys/mman.h>\n',
diff --git a/sysdeps/unix/sysv/linux/tst-mount-consts.py b/sysdeps/unix/sysv/linux/tst-mount-consts.py
index b5c52a4bb2..ba1c373fc4 100755
--- a/sysdeps/unix/sysv/linux/tst-mount-consts.py
+++ b/sysdeps/unix/sysv/linux/tst-mount-consts.py
@@ -39,10 +39,10 @@  def main():
         sys.exit (77)
 
     linux_version_headers = glibcsyscalls.linux_kernel_version(args.cc)
-    # Constants in glibc were updated to match Linux v6.5.  When glibc
+    # Constants in glibc were updated to match Linux v6.6.  When glibc
     # constants are updated this value should be updated to match the
     # released kernel version from which the constants were taken.
-    linux_version_glibc = (6, 5)
+    linux_version_glibc = (6, 6)
     def check(cte, exclude=None):
         return glibcextract.compare_macro_consts(
                 '#include <sys/mount.h>\n',
diff --git a/sysdeps/unix/sysv/linux/tst-pidfd-consts.py b/sysdeps/unix/sysv/linux/tst-pidfd-consts.py
index 1ef14889a8..4a0f757a21 100644
--- a/sysdeps/unix/sysv/linux/tst-pidfd-consts.py
+++ b/sysdeps/unix/sysv/linux/tst-pidfd-consts.py
@@ -39,7 +39,7 @@  def main():
         sys.exit (77)
 
     linux_version_headers = glibcsyscalls.linux_kernel_version(args.cc)
-    linux_version_glibc = (6, 5)
+    linux_version_glibc = (6, 6)
     sys.exit(glibcextract.compare_macro_consts(
                 '#include <sys/pidfd.h>\n',
                 '#include <asm/fcntl.h>\n'