From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1118) id 1235138582BC; Sat, 25 Feb 2023 22:00:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1235138582BC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677362410; bh=KWIx3ocSpOAI+jfqiwKN/CaWYJg+qcDIW3v0p6Cjkac=; h=From:To:Subject:Date:From; b=MgKIibQoY49Bdukc2lFv7qkfTpJUpMmW45yuGnyCRFUtiyYGNasS+njbp3MOXdQw8 xShEdYwMrkM3Mtea2qOs0KaEXHxMXq54sQ9GQz84+O6+0X+75OjvhK6LZRRC0oHgyR XTtD/x0mpt/3sKPQNyJNr780/V11w5y19vFA1AGE= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: John David Anglin To: glibc-cvs@sourceware.org Subject: [glibc] hppa: Drop old parisc-specific MADV_* constants X-Act-Checkin: glibc X-Git-Author: John David Anglin X-Git-Refname: refs/heads/master X-Git-Oldrev: 91689649656314b04f3dbee0415a9254eb1424dd X-Git-Newrev: 79ea63f0053904401021178d55dd4c364eeec131 Message-Id: <20230225220010.1235138582BC@sourceware.org> Date: Sat, 25 Feb 2023 22:00:10 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=79ea63f0053904401021178d55dd4c364eeec131 commit 79ea63f0053904401021178d55dd4c364eeec131 Author: John David Anglin Date: Sat Feb 25 21:59:24 2023 +0000 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 Diff: --- NEWS | 7 ++++++- sysdeps/unix/sysv/linux/hppa/bits/mman.h | 28 ---------------------------- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/NEWS b/NEWS index 080a2060d4..6825780a7b 100644 --- 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 c315efceb0..f5a69693af 100644 --- 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 #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