From patchwork Wed Aug 5 09:19:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 503943 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 505971402D1 for ; Wed, 5 Aug 2015 19:20:01 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=gu8lkW5s; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; q=dns; s= default; b=KF80zOsxwzmIeddQWvXx+qyQqoG7Kr8CXwHaBLrOirsVWnSiCZ8A3 PwovM9c/Tuguffy30jWp3uq/UKQolwKrKk5NsTb2JnuJkzCzNMvxT+m2cjkuCO+Q 93CtHfetNHKWPGBLjVxbiR5mSjmu4Yn2PXuddGce7fVRY6XMVhCHxs= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; s=default; bh=WrLTNErda6gMeImb4YGwtddrkiE=; b=gu8lkW5s+BMlCEtRAS9mPZfUJLR7 OmpBfMzjmDmuPWUsIS3HMpqvCfqTkyGIsHKHvI1B6VAgG6jKrqO3iJ3/GAebRwJQ 0mdNZjqO93l0lTbEtqjcbm0Uqns6YrbO9c2pN6CkDSnhuagRopzlY8rpEgisVBgh Mky9VbuAXUChgI0= Received: (qmail 31100 invoked by alias); 5 Aug 2015 09:19:55 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 31080 invoked by uid 89); 5 Aug 2015 09:19:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: smtp.gentoo.org From: Mike Frysinger To: libc-alpha@sourceware.org Subject: [PATCH] hppa: put custom madvise defines behind __USE_MISC Date: Wed, 5 Aug 2015 05:19:59 -0400 Message-Id: <1438766399-3581-1-git-send-email-vapier@gentoo.org> No other arch exports these defines, and having them in the default namespace causes conformance header tests to fail. Put them behind the __USE_MISC define as that is what other arches seem to use. 2015-08-05 Mike Frysinger * sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_MISC]: Move all MADV_*_PAGES defines behind this feature check. --- sysdeps/unix/sysv/linux/hppa/bits/mman.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sysdeps/unix/sysv/linux/hppa/bits/mman.h b/sysdeps/unix/sysv/linux/hppa/bits/mman.h index e7ee5b8..cbde4b8 100644 --- a/sysdeps/unix/sysv/linux/hppa/bits/mman.h +++ b/sysdeps/unix/sysv/linux/hppa/bits/mman.h @@ -93,14 +93,17 @@ #endif /* The range 12-64 is reserved for page size specification. */ -#define MADV_4K_PAGES 12 /* Use 4K pages */ -#define MADV_16K_PAGES 14 /* Use 16K pages */ -#define MADV_64K_PAGES 16 /* Use 64K pages */ -#define MADV_256K_PAGES 18 /* Use 256K pages */ -#define MADV_1M_PAGES 20 /* Use 1 Megabyte pages */ -#define MADV_4M_PAGES 22 /* Use 4 Megabyte pages */ -#define MADV_16M_PAGES 24 /* Use 16 Megabyte pages */ -#define MADV_64M_PAGES 26 /* Use 64 Megabyte pages */ +/* These are Linux-specific. */ +#ifdef __USE_MISC +# define MADV_4K_PAGES 12 /* Use 4K pages. */ +# define MADV_16K_PAGES 14 /* Use 16K pages. */ +# define MADV_64K_PAGES 16 /* Use 64K pages. */ +# define MADV_256K_PAGES 18 /* Use 256K pages. */ +# define MADV_1M_PAGES 20 /* Use 1 Megabyte pages. */ +# define MADV_4M_PAGES 22 /* Use 4 Megabyte pages. */ +# define MADV_16M_PAGES 24 /* Use 16 Megabyte pages. */ +# define MADV_64M_PAGES 26 /* Use 64 Megabyte pages. */ +#endif /* The POSIX people had to invent similar names for the same things. */ #ifdef __USE_XOPEN2K