public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Szabolcs Nagy <nsz@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/nsz/mtag] malloc: Move MTAG_MMAP_FLAGS definition Date: Thu, 11 Mar 2021 17:40:15 +0000 (GMT) [thread overview] Message-ID: <20210311174015.E7D533893C2A@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1e2237efaa5e6bfa42338f39c8765998da378f1a commit 1e2237efaa5e6bfa42338f39c8765998da378f1a Author: Szabolcs Nagy <szabolcs.nagy@arm.com> Date: Thu Jan 28 17:34:36 2021 +0000 malloc: Move MTAG_MMAP_FLAGS definition This is only used internally in malloc.c, the extern declaration was wrong, __mtag_mmap_flags has internal linkage. Reviewed-by: DJ Delorie <dj@redhat.com> Diff: --- include/malloc.h | 7 ------- malloc/malloc.c | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/malloc.h b/include/malloc.h index 7ae08d53d3..b77761f74d 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -16,11 +16,4 @@ typedef struct malloc_state *mstate; # endif /* !_ISOMAC */ -#ifdef USE_MTAG -extern int __mtag_mmap_flags; -#define MTAG_MMAP_FLAGS __mtag_mmap_flags -#else -#define MTAG_MMAP_FLAGS 0 -#endif - #endif diff --git a/malloc/malloc.c b/malloc/malloc.c index 51cec67e55..61c25d0f93 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -463,11 +463,13 @@ static void *(*__tag_region)(void *, size_t) = __default_tag_region; static void *(*__tag_new_usable)(void *) = __default_tag_nop; static void *(*__tag_at)(void *) = __default_tag_nop; +# define MTAG_MMAP_FLAGS __mtag_mmap_flags # define TAG_NEW_MEMSET(ptr, val, size) __tag_new_memset (ptr, val, size) # define TAG_REGION(ptr, size) __tag_region (ptr, size) # define TAG_NEW_USABLE(ptr) __tag_new_usable (ptr) # define TAG_AT(ptr) __tag_at (ptr) #else +# define MTAG_MMAP_FLAGS 0 # define TAG_NEW_MEMSET(ptr, val, size) memset (ptr, val, size) # define TAG_REGION(ptr, size) (ptr) # define TAG_NEW_USABLE(ptr) (ptr)
next reply other threads:[~2021-03-11 17:40 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-11 17:40 Szabolcs Nagy [this message] -- strict thread matches above, loose matches on Subject: below -- 2021-03-19 11:57 Szabolcs Nagy 2021-03-11 17:38 Szabolcs Nagy 2021-03-04 16:25 Szabolcs Nagy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210311174015.E7D533893C2A@sourceware.org \ --to=nsz@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).