hppa: Drop old parisc-specific MADV_* constants

The Linux kernel upstream commit 71bdea6f798b ("parisc: Align parisc
MADV_XXX constants with all other architectures") dropped the
parisc-specific MADV_* values in favour of the same constants as
other architectures. In the same commit a wrapper was added which
translates the old values to the standard MADV_* values to avoid
breakage of existing programs.

This upstream patch has been downported to all stable kernel trees as
well.

This patch now drops the parisc specific constants from glibc to
allow newly compliled programs to use the standard MADV_* constants.

v2: Added NEWS section, based on feedback from Florian Weimer

Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/NEWS b/NEWS
index 080a2060d4da396c3019af8b772fe7d98299f202..6825780a7b70b10e1f35ccde69dbdf8e1afc13ba 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -18,7 +18,12 @@ Major new features:
 
 Deprecated and removed features, and other changes affecting compatibility:
 
-  [Add deprecations, removals and changes affecting compatibility here]
+* In the Linux kernel for the hppa/parisc architecture some of the
+  MADV_XXX constants were changed to have the same values as the other
+  architectures.  New programs compiled with this glibc version and which
+  use the madvise call will require at least Linux kernel version 6.2,
+  alternatively stable kernels from versions 6.1.6, 5.15.87, 5.10.163,
+  5.4.228, 4.19.270 or 4.14.303.
 
 Changes to build and runtime requirements:
 

diff --git a/sysdeps/unix/sysv/linux/hppa/bits/mman.h b/sysdeps/unix/sysv/linux/hppa/bits/mman.h
index c315efceb0707181246547bd6e37ab00b8514d7e..f5a69693af40ebdae198f7a8f0599e96ff2b76fe 100644 (file)
--- a/sysdeps/unix/sysv/linux/hppa/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/mman.h
@@ -39,11 +39,6 @@
 #define MAP_FIXED_NOREPLACE 0x100000   /* MAP_FIXED but do not unmap
                                           underlying mapping.  */
 
-/* Advice to "madvise"  */
-#ifdef __USE_MISC
-# define MADV_SOFT_OFFLINE 101 /* Soft offline page for testing.  */
-#endif
-
 #include <bits/mman-linux.h>
 
 #undef MAP_TYPE
@@ -59,26 +54,3 @@
 #define MS_ASYNC       2               /* Sync memory asynchronously */
 #undef MS_INVALIDATE
 #define MS_INVALIDATE  4               /* Invalidate the caches */
-
-/* Advice to "madvise"  */
-#ifdef __USE_MISC
-# undef MADV_MERGEABLE
-# define MADV_MERGEABLE   65   /* KSM may merge identical pages */
-# undef MADV_UNMERGEABLE
-# define MADV_UNMERGEABLE 66   /* KSM may not merge identical pages */
-# undef MADV_HUGEPAGE
-# define MADV_HUGEPAGE  67     /* Worth backing with hugepages */
-# undef MADV_NOHUGEPAGE
-# define MADV_NOHUGEPAGE 68    /* Not worth backing with hugepages */
-# undef MADV_DONTDUMP
-# define MADV_DONTDUMP  69     /* Explicity exclude from the core dump,
-                                  overrides the coredump filter bits */
-# undef MADV_DODUMP
-# define MADV_DODUMP    70     /* Clear the MADV_NODUMP flag */
-# undef MADV_WIPEONFORK
-# define MADV_WIPEONFORK 71    /* Zero memory on fork, child only.  */
-# undef MADV_KEEPONFORK
-# define MADV_KEEPONFORK 72    /* Undo MADV_WIPEONFORK.  */
-# undef MADV_COLLAPSE
-# define MADV_COLLAPSE   73    /* Synchronous hugepage collapse.  */
-#endif